Removes obsolete import
Cleans up code