Removed unused imports and unnecessary code