Cleanup
More cleanup, switch to python-sh