Cleanup Intellij Code->Inspect Code

[breed]

Run Code->Inspect Code in Intellij and clean up the errors that are flagged.

(This can probably be broken down into sub issues.)