[Router] Cleanup