Remove hard dependency on PyYAML
Undo the sh stuff for now