Cleaned up Team class imports