Sleeping as otherwise we can't umount
Tidy
Removed out-of-date TODO file