Fix hashing and remove some runtime debug statements