Removing unused code.

Most of this was just taking up space, and makes
my change a lot harder, so yeh, goodbye.