comment out unused code, simplify hash-union