Clean up dirty imports