Moved methods from World into Room.
Also changed some strange old delete-guards.