Clean up after router v2 merge