Tidy up redundant join and leave methods