more router cleanup