Removing unused code.

Most of this was just taking up space, and makes
my change a lot harder, so yeh, goodbye.
Merge pull request #425 from ambiata/topic/bring-out-yer-dead

Removing unused code.
Better data-types.