Pull out the stuff in mp prompt which has more to do w/ the generator
Added remove-machine.