Cleaned up teams