make finals static, remove unused local

found by findbugs
http://b/issue?id=1856725
http://b/issue?id=1856786
3 files changed