There are occasional reports of mount points not successfully cleared after a failed image-install, say of a corrupted or incorrect image: this will lead to a failure in subsequent install attempts. In the absence of a reproducer, add further checks to the cleanup function to ensure that mount points are unmounted before clearing residual directories.