Work towards cleaning up the image and making slave nodes easier to
start.