Clean up teams a little bit