Merge "[sfc] Remove unused router related methods"