Patch clang break, remove dead code.