Removed a lot of dead code. I've done a good bit of testing, pretty sure it was
all really dead. Further testing would be wise.