Removed completed "TODO" comments.
Change WorldObjectTree to implement HashMap