Remove some dead code found by Coverity
Release v2.0.18