better cleanup of failed clients