Making the unbind between an unit and an service instance on remove
units.
Minor refactor.