2.0 kill off more deprecated stuff

I suggest reading the two commits separately. The first one just removes IntelliJ warnings from files affected by the second one. It much easier to remove deprecated stuff if there isn't a background of warnings because then I can rely on the IDE to tell me when stuff is no longer needed.