Minor routing cleanup