Implemented cleanup of failed management machines