Cleaning up hashing code

Removing use of method which will be going away soon