Moved join/part to PM
a bit of code cleanup