A little more intellij cleanup, since I'm here ...