ISSUE-21: Cleaning up some of the commented out code.