Remove unneeded COMM searches