removal of join/leave wip