Could we remove the commented-out code?