Machine add controller clean up