Matcher

cleanup code,
remove obsolete interface and classes.

negligible regressions