Fix dead assignments reported by CLANG