Get rid of some of the deprecated methods, this isn't really needed.

Just felt like doing it while reading the code.