Get rid of supervisor state