some routing cleanup