findbugs error cleanup