Remove unnecessary overriding method non-java doc comment from template
A few more find bugs cleanups.
Remove some dead code.