more cleaning for Route* and some other bits