Removed unused imports and methods