more graceful shutdown and client killing