Remove calls to match in routes