Quick cleanup

Removed unnecessary imports and various other things