add findbugs
Remove java 7-only code. Sigh.