Removed comment outs