Remove some unused classes, address bugs from FindBugs