cleaned out lots of old unused stuff