optimized imports, cleanup