Cleanups, removed internal mount loops and IOSleeps