Remove a bunch of now unused code.