getting rid of some comment outs...