Reduce teams controller cruft