minimal clean up (unused imports, commented out code etc.)