Using short hashes
Remove dead stuff, and actually exit prematurely in case of error in the wrapper.