Code cleanup, remove debugs, exit team join