Getting rid of teams, code changes