Remove orphaned code
Ensure key hashing only hashes as many output bytes as necessary