Remove excess logic from team settings