Removed unused imports and some other stuff