removed comment-outs