WorldManager.java cleanup