Cleanup imports.
Add removal of empty directories.