Merge "Remove eval as far too many false postivies"