FindBugs warnings removed