Findbugs: removed a lot of deadstores
Merge pull request #1658 from pveentjer/cleanup/deadstores

Findbugs: removed a lot of deadstores