of_world cleanups