Get rid of path matching