removed some findbugs bugs