Finish migrating to standalone install of supervisor