Remove findbugs warnings