Remore URIMatcher and propagate generics