remove some commented stuff