Clean up of import