Removed a bunch of now defunct code.