I think you can just remove all of the logic relevant to hashing which will make this much simpler.