Cleanup router duplication