refactored models and removed Team functionality