Commenting out additional not strictly necessary code.