Revert gratuitous os.rename -> shutil.move changes.

This kills overzealous changes to shutil.move for 2 cases
where the code carefully arranges for same-fs safe os.renames.

It also proposes removal of AsyncCleaner (with a deprecation).