Clean up of import statements