remove BasicMatchCriteria from common