Cleanup of object_generator