Findbugs: removed a lot of deadstores