get rid of old stuff

in preparation for a week3 feature branch