This commit removes dead code, mostly pointed out by clang.