Removed unused imports and some whitelines