Cleanup (removal of debug message and unused imports).