Fix memory leak

Last dispatch release has some problems with open files. Revert to last
stable version of sohva
Code cleanup