World updates to remove references to player position
merge