If we're removing these for good, can we delete the commented-out code?  If we might want them for later, can you add a comment that explains why it's commented out (so that others who stumble across it know not to remove it?)