Remove unused imports that were commented out