fixes for dead assignments