Cleaning up commented out code for recent commit.