For option 1, I didn't tell you to comment-out the whole define. I told you to change the define so that its value was defined as blank.
For option 2, well, the layout probably broke because what I told you to remove included an extra </div> that shouldn't have been there in the first place. I made the mistake of assuming that the template code you quoted hadn't been unreasonably messed with.
Oh man, whoever customized that section of the code broke up all the logic badly, moving HTML around without respect to the PHP logic that controls optional components displaying when they should and hiding when they shouldn't.
Change that whole section of code to this (I've moved 2 </div> tags around):
<!--bof-branding display-->
<div id="logoWrapper">
<div id="logo"><?php echo '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . '">' . zen_image($template->get_template_dir(HEADER_LOGO_IMAGE, DIR_WS_TEMPLATE, $current_page_base,'images'). '/' . HEADER_LOGO_IMAGE, HEADER_ALT_TEXT) . '</a>'; ?>
<?php if (HEADER_SALES_TEXT != '' || (SHOW_BANNERS_GROUP_SET2 != '' && $banner = zen_banner_exists('dynamic', SHOW_BANNERS_GROUP_SET2))) { ?>
<div id="taglineWrapper">
<?php
if (HEADER_SALES_TEXT != '') {
?>
<div id="tagline"><?php echo HEADER_SALES_TEXT;?></div>
<?php
}
?>
</div>
<?php
if (SHOW_BANNERS_GROUP_SET2 != '' && $banner = zen_banner_exists('dynamic', SHOW_BANNERS_GROUP_SET2)) {
if ($banner->RecordCount() > 0) {
?>
<div id="bannerTwo" class="banners"><?php echo zen_display_banner('static', $banner);?></div>
<?php
}
}
?>
<?php } // no HEADER_SALES_TEXT or SHOW_BANNERS_GROUP_SET2 ?>
</div>
</div>
<br class="clearBoth" />
<!--eof-branding display-->
