massive routing cleanup