Removed eager computations of hash