Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra93a5cd28fb275ee24176ec9e131c85ff212d2fd
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java	(.../Grouper.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java	(.../Grouper.java)	(revision a93a5cd28fb275ee24176ec9e131c85ff212d2fd)
@@ -175,29 +175,23 @@
      */
     public void removeAllLearnersFromGrouping(Grouping grouping) throws GroupingException {
 
-	boolean canRemove = true;
-
 	for (Group group : grouping.getGroups()) {
 	    if (!group.mayBeDeleted()) {
-		canRemove = false;
-		break;
+		String error = "Tried to clear a group which cannot be removed (tool sessions probably exist). Grouping "
+			+ grouping + ". Not removing the groupings.";
+		log.error(error);
+		throw new GroupingException(error);
 	    }
 	}
 
-	if (canRemove) {
-	    for (Group group : grouping.getGroups()) {
-		if (log.isDebugEnabled()) {
-		    log.debug("Cleared all  users from group " + group.getGroupName());
-		}
-		group.getUsers().clear();
+	for (Group group : grouping.getGroups()) {
+	    if (log.isDebugEnabled()) {
+		log.debug("Cleared all users and removed group " + group.getGroupName());
 	    }
-	} else {
-	    String error = "Tried to clear a group which cannot be removed (tool sessions probably exist). Grouping "
-		    + grouping + ". Not removing the groupings.";
-	    log.error(error);
-	    throw new GroupingException(error);
+	    group.getUsers().clear();
 	}
     }
+
     /**
      * Create an empty group for the given grouping. Trims the name of the group before creating the group. If the group
      * name group name already exists then it appends a datetime string to make the name unique. Gives it 5 attempts to
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
diff -u -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4 -ra93a5cd28fb275ee24176ec9e131c85ff212d2fd
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision a93a5cd28fb275ee24176ec9e131c85ff212d2fd)
@@ -285,6 +285,7 @@
 	    if (grouper != null) {
 		try {
 		    grouper.removeAllLearnersFromGrouping(grouping);
+		    grouping.getGroups().clear();
 		} catch (GroupingException e) {
 		    throw new LessonServiceException(e);
 		}