Adding support to clear services