Index: branches/groups/node.tpl.php
===================================================================
--- branches/groups/node.tpl.php	(revision 33)
+++ branches/groups/node.tpl.php	(revision 32)
@@ -5,49 +5,47 @@
     <h2 class="node-title"><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
   <?php endif; ?>
   <?php print $picture ?>
-  <?php if (_is_groups_site()) { ?>
   <div class="visibility">
-    <?php print !empty($node->og_public) ? 'public' : 'private'; ?>
+    <?php print $node->og_public ? 'public' : 'private'; ?>
   </div>
-  <?php 
-    if (!empty($node->og_groups) && !$is_preview) {
-      $og_links = array();
-      $current_groups = og_node_groups_distinguish($node->og_groups_both);
-      foreach ($node->og_groups_both as $gid => $title) {
+
+   <?php if ($node->og_groups && !$is_preview) {
+     $og_links = array();
+     $current_groups = og_node_groups_distinguish($node->og_groups_both);
+     foreach ($node->og_groups_both as $gid => $title) {
         global $user;
         // User may only see a group if she is a member or it is accessible.
         if (isset($user->og_groups[$gid]) || isset($current_groups['accessible'][$gid])) {
           $og_links['og_'. $gid] = array('title' => $title, 'href' => "node/$gid");
         }
       }
-      $og_links = theme('links', $og_links);
-      print '<div class="terms groups">'. format_plural(count($node->og_groups), 'group', 'groups') .': '.  $og_links .'</div>';
-    }
-  ?>
-  <?php } else { ?>
-  <div class="clear-block">
-   <div class="terms"><?php print $terms ?></div>
-  <?php } ?>
+     $og_links = theme('links', $og_links);
+     print '<div class="terms groups">';
+     print format_plural(count($node->og_groups), 'group', 'groups'). ': '.  $og_links. '</div>';
+  } ?>
 
-   <div class="info<?php print ($page == 0) ? '-list' : '-page'; ?>"><?php print substr(str_replace(array(' on ', 'Submitted by '), array(' - ', ''), $submitted), 0, -1); ?></div>
-   <?php if (!empty($modified)): ?>
-     <div class="modified info<?php print ($page == 0) ? '-list' : '-page'; ?>"><?php print $modified; ?></div>
-   <?php endif; ?>
-  
-  <?php if (!_is_groups_site()) { // end of class="clear-block" ?>
-  </div>
-  <?php } ?>
-  <div class="content">
-    <?php print fixblockquotes($content); ?>
-  </div>
-  <?php if ($picture): ?>
-    <br class='clear' />
-  <?php endif; ?>
-  <?php if (!_is_groups_site()) { if ($links): ?><div class="links">» <?php print $links ?></div><?php endif; } else { ?>
-  <?php if ($links || $terms) { ?>
-  <div class="links">
+
+   <div class="info<?php print ($page == 0) ? '-list' : '-page'; ?>">
+   <?php
+     if ($submitted) {
+       print substr(str_replace(array(' on ', 'Submitted by '), array(' - ', ''), $submitted), 0, -1); 
+     }
+   ?>
+   </div>
+
+   <div class="content">
+     <?php print fixblockquotes($content); ?>
+   </div>
+     <?php if ($picture): ?>
+       <br class='clear' />
+     <?php endif; ?>
+
+
+
+<?php if ($links || $terms) { ?>
+<div class="links">
    <div class="left">
-    <?php if ($terms && !$is_preview) { ?>
+    <?php if ($terms  && !$is_preview) { ?>
        <?php 
 			 	  // group terms by vocab
 			    foreach ($node->taxonomy as $tid => $term) {
@@ -68,9 +66,7 @@
    <?php if ($links) { ?>
      <div class="right">» <?php print $links?></div>
    <?php } ?>&nbsp;
-  </div>
-  <?php } ?>
-  <?php } ?>
-  
+</div>
+<?php }; ?>
 <?php print ($sticky && $page == 0) ? '</div></div></div></div></div>' : ''; ?>
 </div>
Index: branches/groups/template.php
===================================================================
--- branches/groups/template.php	(revision 33)
+++ branches/groups/template.php	(revision 32)
@@ -280,10 +280,3 @@
  * Disabled to save CPU
  */
 function phptemplate_forum_topic_navigation($node) {}
-
-/**
- * Private function to tell when to use groups styling for nodes and possibly other areas.
- */
-function _is_groups_site() {
-  return in_array(_get_site(), array('groups.drupal.org', 'groupsbeta.drupal.org'));
-}
Index: branches/5/node.tpl.php
===================================================================
--- branches/5/node.tpl.php	(revision 33)
+++ branches/5/node.tpl.php	(revision 32)
@@ -1,76 +1,26 @@
-<?php $is_preview = $_POST['op'] == t('Preview') ? TRUE : FALSE; ?>
 <div class="node<?php if (!$status) { print " node-unpublished"; } ?>">
 <?php print ($sticky && $page == 0) ? '<div class="sticky"><div class="w1"><div class="w2"><div class="w3"><div class="w4">' : ''; ?>
   <?php if ($page == 0): ?>
     <h2 class="node-title"><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
   <?php endif; ?>
   <?php print $picture ?>
-  <?php if (_is_groups_site()) { ?>
-  <div class="visibility">
-    <?php print !empty($node->og_public) ? 'public' : 'private'; ?>
-  </div>
-  <?php 
-    if (!empty($node->og_groups) && !$is_preview) {
-      $og_links = array();
-      $current_groups = og_node_groups_distinguish($node->og_groups_both);
-      foreach ($node->og_groups_both as $gid => $title) {
-        global $user;
-        // User may only see a group if she is a member or it is accessible.
-        if (isset($user->og_groups[$gid]) || isset($current_groups['accessible'][$gid])) {
-          $og_links['og_'. $gid] = array('title' => $title, 'href' => "node/$gid");
-        }
-      }
-      $og_links = theme('links', $og_links);
-      print '<div class="terms groups">'. format_plural(count($node->og_groups), 'group', 'groups') .': '.  $og_links .'</div>';
-    }
-  ?>
-  <?php } else { ?>
+  
   <div class="clear-block">
    <div class="terms"><?php print $terms ?></div>
-  <?php } ?>
-
    <div class="info<?php print ($page == 0) ? '-list' : '-page'; ?>"><?php print substr(str_replace(array(' on ', 'Submitted by '), array(' - ', ''), $submitted), 0, -1); ?></div>
    <?php if (!empty($modified)): ?>
      <div class="modified info<?php print ($page == 0) ? '-list' : '-page'; ?>"><?php print $modified; ?></div>
    <?php endif; ?>
-  
-  <?php if (!_is_groups_site()) { // end of class="clear-block" ?>
   </div>
-  <?php } ?>
   <div class="content">
     <?php print fixblockquotes($content); ?>
   </div>
-  <?php if ($picture): ?>
-    <br class='clear' />
-  <?php endif; ?>
-  <?php if (!_is_groups_site()) { if ($links): ?><div class="links">» <?php print $links ?></div><?php endif; } else { ?>
-  <?php if ($links || $terms) { ?>
-  <div class="links">
-   <div class="left">
-    <?php if ($terms && !$is_preview) { ?>
-       <?php 
-			 	  // group terms by vocab
-			    foreach ($node->taxonomy as $tid => $term) {
-				    $vocabs[$term->vid][$term->tid] = array('title' => $term->name, 
-																										'href' => "taxonomy/term/$tid");
-				  }
-				  krsort($vocabs);
+<?php if ($links): ?>
 
-				  //render a line for each vocab. performs a query to get vocab name
-				  foreach ($vocabs as $vid => $vocab) {
-					  $fullvocab = taxonomy_get_vocabulary($vid);
-					  $output .= "<div id=\"node-vocab-$vid\">". $fullvocab->name. ': '. theme('links', $vocab). "</div>";
-					}
-			 ?>
-       <div class="terms"><?php print $output; ?></div>
-    <?php } ?>
-   </div>
-   <?php if ($links) { ?>
-     <div class="right">» <?php print $links?></div>
-   <?php } ?>&nbsp;
-  </div>
-  <?php } ?>
-  <?php } ?>
-  
+    <?php if ($picture): ?>
+      <br class='clear' />
+    <?php endif; ?>
+    <div class="links">» <?php print $links ?></div>
+<?php endif; ?>
 <?php print ($sticky && $page == 0) ? '</div></div></div></div></div>' : ''; ?>
 </div>
Index: branches/5/template.php
===================================================================
--- branches/5/template.php	(revision 33)
+++ branches/5/template.php	(revision 32)
@@ -282,10 +282,3 @@
  * Disabled to save CPU
  */
 function phptemplate_forum_topic_navigation($node) {}
-
-/**
- * Private function to tell when to use groups styling for nodes and possibly other areas.
- */
-function _is_groups_site() {
-  return in_array(_get_site(), array('groups.drupal.org', 'groupsbeta.drupal.org'));
-}