Removed supervisor class, stopped working with the new changes and no
time to fix.