removed findbugs annotations