Simplified team system. Removed old deprecated classes.
Fix for accidental perm change