Code Cleanup

Fixing up a handful of Findbugs issues reported on nightly. Also lowering visibility and removing a lot of unused code detected by UCDetector. I plan to continue iterating on this and have the PR builder verify I'm not breaking anything.