getting rid of some commented stuff