Team fixes

Removes teams ondisable