fix findbugs warnings
bugfix: undo new equals method implementation