strip out some of the old stuff
more stuff
cleanup