* Removed about 800 lines of code. Replaced with calls to leatherman
* Removed 3 unneeded deps in manifest