Removed unused imports, TODO comment