clean up obsolete matcher code
Supress superflous warnings about portals that aren't portals.