new matchers, tests
remove dead code
handler config fixup
fix handler config validation