Remove some more entries that are false positives, or have been