Fixed dead assignments