Add option to delete client during the handling of a graceful-shutdown