Some fixes for CLANG

Mostly dead assignments