clean up delegators/matchers