Remove make_team statements