Scrapped redundant router code