Remove unused test configuration
Whitespace
Remove unused cruft
Add findbugs annotations dependency