Further cleanup of DungeonObjects