Clean up imports too