Remove deprecated $match_on