routing cleanup