Cleaned up after import/export