3.0 Fix router parsing and associated deletes

Fix #4218 and #4205