Removes obsolete imports
Cleans up package