Remove some dead code + fix clang warning.