Clean up bad imports