Get rid of WorldObject
Code cleanup