Get rid of unnecessary URIMatcher stuff