cleaning up some of the get-machine stuff