taking out some hard coded machine name, and some unnecessary code.