Remove dead code and revert generate_signature_hash change.