HG-34 cleanup some stuff
HG-34 simplify routing scheme