Removes more findings.

Refs #137