Cleaning up leftover commented-out code.