mv nonroutable ways to nonroutable types
simplify track