cleanup RouterInterface vs RequestMatcherInterface