fix cce
reimplement all the refactoring participants w/o the regex-based search