refactored out the active teams and inactive teams, reverting to one massive team list