Router clean-up