Cleanup WIP new join/leave/update system.