remove some commented out, dead code