Consolidate, deprecate, remove old custom router api