Try to avoid commenting out code -- if you absolutely have to, leave a note describing the conditions for which the code should be uncommented or completely removed.