Fix several high priority static analysis checks.
remove unused import.
Fix method
Merge pull request #676 from nla/bug/acm-findbugs

Fix a couple of high priority findbugs issues.