Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
===================================================================
diff -u -rec3c75ae05c1ca789ef9049ed749841f69d1e821 -r60355e9a91260c605e1a55e1f2329dd69fea08b9
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision ec3c75ae05c1ca789ef9049ed749841f69d1e821)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(.../LearnerProgress.java)	(revision 60355e9a91260c605e1a55e1f2329dd69fea08b9)
@@ -243,12 +243,6 @@
      *
      */
     public Map<Activity, Date> getAttemptedActivities() {
-//	StringBuilder bldr = new StringBuilder("Progress ").append(this.getLearnerProgressId()).append(" user ")
-//		.append(this.getUser().getLogin()).append(" attempted fetch: ");
-//	for (Activity act : attemptedActivities.keySet()) {
-//	    bldr.append(act.getActivityId()).append(act.getTitle()).append(", ");
-//	}
-//	log.debug(bldr.toString());
 	return this.attemptedActivities;
     }
 
@@ -261,12 +255,6 @@
      *
      */
     public Map<Activity, CompletedActivityProgress> getCompletedActivities() {
-//	StringBuilder bldr = new StringBuilder("Progress ").append(this.getLearnerProgressId()).append(" user ")
-//		.append(this.getUser().getLogin()).append(" completed fetch: ");
-//	for (Activity act : completedActivities.keySet()) {
-//	    bldr.append(act.getActivityId()).append(act.getTitle()).append(", ");
-//	}
-//	log.debug(bldr.toString());
 	return this.completedActivities;
     }
 
@@ -356,25 +344,11 @@
      *            needed to get any child activities correctly from
      *            Hibernate (grr - shouldn't be required)
      */
-    public synchronized void setProgressState(Activity activity, byte state, IActivityDAO activityDAO) {
+    public void setProgressState(Activity activity, byte state, IActivityDAO activityDAO) {
 
-//	StringBuilder bldr = new StringBuilder("Progress ").append(this.getLearnerProgressId())
-//		.append(" before dump: activity ").append(activity.getActivityId()).append(" state ").append(state)
-//		.append(" attempted ");
-//	for (Activity act : getAttemptedActivities().keySet()) {
-//	    bldr.append(act.getActivityId()).append(act.getTitle()).append(", ");
-//	}
-//	bldr.append(" completed ");
-//	for (Activity act : getCompletedActivities().keySet()) {
-//	    bldr.append(act.getActivityId()).append(act.getTitle()).append(", ");
-//	}
-//	log.debug(bldr.toString());
-//
 	// remove activity from current set
 	byte oldState = getProgressState(activity);
 	if (oldState == state) {
-//	    log.debug("Progress " + this.getLearnerProgressId() + " does not change state " + state + " of activity "
-//		    + activity.getActivityId());
 	    // no real change, forget the rest of the method
 	    return;
 	}
@@ -389,16 +363,10 @@
 	}
 
 	if (oldState == LearnerProgress.ACTIVITY_NOT_ATTEMPTED) {
-//	    log.debug("Progress " + this.getLearnerProgressId() + " does not remove not attempted activity "
-//		    + activity.getActivityId());
-	    ;
+	    // do nothing
 	} else if (oldState == LearnerProgress.ACTIVITY_ATTEMPTED) {
-//	    log.debug("Progress " + this.getLearnerProgressId() + " removes attempted activity "
-//		    + activity.getActivityId());
 	    this.getAttemptedActivities().remove(activity);
 	} else if (oldState == LearnerProgress.ACTIVITY_COMPLETED) {
-//	    log.debug("Progress " + this.getLearnerProgressId() + " removes completed activity "
-//		    + activity.getActivityId());
 	    this.getCompletedActivities().remove(activity);
 	    if (activity.isComplexActivity()) {
 		ComplexActivity complex = (ComplexActivity) activityDAO
@@ -413,42 +381,20 @@
 
 	// add activity to new set
 	if (state == LearnerProgress.ACTIVITY_NOT_ATTEMPTED) {
-//	    log.debug("Progress " + this.getLearnerProgressId() + " does not add not attempted activity "
-//		    + activity.getActivityId());
-	    ;
+	    // do nothing
 	} else if (state == LearnerProgress.ACTIVITY_ATTEMPTED) {
-//	    log.debug(
-//		    "Progress " + this.getLearnerProgressId() + " adds attempted activity " + activity.getActivityId());
 	    this.getAttemptedActivities().put(activity, new Date());
 	} else if (state == LearnerProgress.ACTIVITY_COMPLETED) {
-//	    log.debug(
-//		    "Progress " + this.getLearnerProgressId() + " adds completed activity " + activity.getActivityId());
 	    this.getCompletedActivities().put(activity,
 		    new CompletedActivityProgress(this, activity, activityStartDate, new Date()));
 	}
-
-//	bldr = new StringBuilder("Progress ").append(this.getLearnerProgressId()).append(" after dump: activity ")
-//		.append(activity.getActivityId()).append(" state ").append(state).append(" attempted ");
-//	for (Activity act : getAttemptedActivities().keySet()) {
-//	    bldr.append(act.getActivityId()).append(act.getTitle()).append(", ");
-//	}
-//	bldr.append(" completed ");
-//	for (Activity act : getCompletedActivities().keySet()) {
-//	    bldr.append(act.getActivityId()).append(act.getTitle()).append(", ");
-//	}
-//	log.debug(bldr.toString());
-
-//	if (this.getLearnerProgressId() != null) {
-//	    activityDAO.update(this);
-//	}
     }
 
     /**
      * Has the user completed the lesson? We don't care how (ie at end of
      * sequence or after a "stop after activity")
      */
     public boolean isComplete() {
-
 	return lessonComplete == LESSON_END_OF_DESIGN_COMPLETE || lessonComplete == LESSON_IN_DESIGN_COMPLETE;
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r50cbf1b5ae62c1b0e9a6c391e6ecda8ae284ad02 -r60355e9a91260c605e1a55e1f2329dd69fea08b9
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 50cbf1b5ae62c1b0e9a6c391e6ecda8ae284ad02)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 60355e9a91260c605e1a55e1f2329dd69fea08b9)
@@ -609,7 +609,7 @@
      * @return the updated learner progress
      */
     @Override
-    public synchronized void completeActivity(Integer learnerId, Activity activity, Long progressID) {
+    public void completeActivity(Integer learnerId, Activity activity, Long progressID) {
 	if (LearnerService.log.isDebugEnabled()) {
 	    LearnerService.log
 		    .debug("Completing activity ID " + activity.getActivityId() + " for learner " + learnerId);