Clean up the imports