Address code review comments.
A new hash is faster than a dup
Code review for deprecation warnings.