Remove some dead assignements found by scan-build