Revert "SupervisingController"

This reverts commit 24646fecd5da63e1bda45ff0161bd8a9269154b9.