removed comment outs