Clean up comments and unused imports