removed unused imports, cleanup