Remove router dependencies