cleaned out some old stuff, nothing really changed from lastc ommit