Service for team list cleaned up