Code cleanup, remove debugs, exit team join
Merge pull request #13 from Xadneil/Daniel_develop

Code cleanup, remove debugs, exit team join