Router cleanup