pleasuring findbugs, removed some dead code