Clean up unused imports and comments