SkilledRouter clean-up