Removed unused imports and code