Clean up and handle sudo automatically

This should all work... going to test it on one of my VMs in a moment just to be sure.