Cleanup unused imports and comments