Simplify code. No functionality change.
Removing some methods which appear to be unused (at least in clang, lld and lldb).