Revert "Findbugs: different issues solved"

This reverts commit dcda79e2c02fda4e0fe52f61bf61712742e1f0db.