17cb78ce removed some commented out code; however, some code that was never used was left in.
mentioned in commit b35a13e5