Whole bunch of cleanup.

Got rid of a whole lot of now-redundant files.