Don't commit commented-out code without a good reason AND a code comment that explains why it's there