Remove various bits of dead code found by CLANG.