Don't be afraid to delete or modify lines. We're under version control--we can always find out what the old line was if we need to. Having commented-out lines everywhere just makes things cluttered and confusing.