Removing commented-out code, we can always retrieve it from VCS if necessary.