Cleanup unused imports