Removes even more findings.

Refs #137