Addressing polesye's comments.

Updated CHANGELOG.rst. Removed commented out code.