HH-29111 make routes acceptable as keys in routing, cleanup