removed unused imports and todo