Cleanup import