router: cleanup