Clean out some commented-out code, and an unused method.