Cleaned up code some more
-Removed uneeded imports