Remove unused code.
Improve matcher/setter.