Clean up of imports