diff --git a/mod/data/fields.php b/mod/data/fields.php
index 612525c0c4c..cce6a6e04aa 100755
--- a/mod/data/fields.php
+++ b/mod/data/fields.php
@@ -164,21 +164,6 @@
             break;
     }
 
-/// Check to see if groups are being used here
-    if ($groupmode = groupmode($course, $cm)) {   // Groups are being used
-        $currentgroup = setup_and_print_groups($course, $groupmode, "view.php?id=$cm->id");
-    } else {
-        $currentgroup = 0;
-    }
-
-    if ($currentgroup) {
-        $groupselect = " AND groupid = '$currentgroup'";
-        $groupparam = "&groupid=$currentgroup";
-    } else {
-        $groupselect = "";
-        $groupparam = "";
-    }
-
 /// Print the tabs
 
     $currenttab = 'fields';
diff --git a/mod/data/templates.php b/mod/data/templates.php
index 5752938ff1f..48bf21220b3 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -108,21 +108,6 @@
         }
     }
 
-/// Check to see if groups are being used here
-    if ($groupmode = groupmode($course, $cm)) {   // Groups are being used
-        $currentgroup = setup_and_print_groups($course, $groupmode, "view.php?id=$cm->id");
-    } else {
-        $currentgroup = 0;
-    }
-
-    if ($currentgroup) {
-        $groupselect = " AND groupid = '$currentgroup'";
-        $groupparam = "&groupid=$currentgroup";
-    } else {
-        $groupselect = "";
-        $groupparam = "";
-    }
-
 /// Print the tabs
     $currenttab = 'templates';
     include('tabs.php');