Got rid of a bunch of old stuff and the code now compiles