diff --git a/dashboard/templates/server-list.html b/dashboard/templates/server-list.html
index 3ce3696..bfec53e 100644
--- a/dashboard/templates/server-list.html
+++ b/dashboard/templates/server-list.html
@@ -7,11 +7,7 @@
 
 <div class="row">
     <div class="col-md-12">
-        {% if group %}
-        <h1 class="page-header"><i class="fa fa-list-alt fa-fw"></i> Details for {{ group }} ({{ results_date|date:"Y-m-d" }} - {{ status_list|length }} servers)</h1>
-        {% else %}
         <h1 class="page-header"><i class="fa fa-list-alt fa-fw"></i> Details ({{ results_date|date:"Y-m-d"  }} - {{ status_list|length }} servers)</h1>
-        {% endif %}
     </div>
 </div>
 <div class="row">
@@ -39,8 +35,6 @@
                 <thead>
                     <tr>
                         <th class='text-center'>OS</th>
-                        <th class='text-center'>Group</th>
-                        <th class='text-center'>Team</th>
                         <th class='text-center'>Hostname</th>
                         <th class='text-center'>Updates #</th>
                         <th class='text-center'>Uptime</th>
@@ -50,8 +44,6 @@
                     {% for stat in status_list %}
                     <tr>
                         <td class='status-{{ stat.os_status }} text-center'>{{ stat.server.os }}</td>
-                        <td class='text-center'><a href="{% url 'server-list-by-group' stat.server.group.name results_date.year results_date.month results_date.day %}">{{ stat.server.group }}</a></td>
-                        <td class='text-center'><a href="{% url 'server-list-by-team' stat.server.team.color results_date.year results_date.month results_date.day %}">{{ stat.server.team }}</a></td>
                         <td><a href="{% url 'packages-by-host' stat.server.hostname %}">{{ stat.server.hostname }}</b></td>
                         <td class='status-{{ stat.updates_status }} text-center'>{{ stat.updates }}</td>
                         <td class='status-{{ stat.uptime_status }} text-center'>{{ stat.uptime }}</td>