remove the shutdown of the service and client