Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
diff -u -rf621e87b80149d33e8a6a3bd10137dc31acce569 -racb0851f5348ca7f4d535d181d6b35fcb539272c
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision f621e87b80149d33e8a6a3bd10137dc31acce569)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision acb0851f5348ca7f4d535d181d6b35fcb539272c)
@@ -885,29 +885,14 @@
 	    throw new ToolException(error);
 	}
 
-	if ((nbContent = retrieveNoticeboard(toolContentId)) == null) {
-	    // use default content
-	    NoticeboardContent defaultContent = retrieveNoticeboard(getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
+	nbContent = retrieveNoticeboard(toolContentId);
+	NoticeboardSession nbSession = new NoticeboardSession(toolSessionId, toolSessionName, nbContent, new Date(
+		System.currentTimeMillis()), NoticeboardSession.NOT_ATTEMPTED);
 
-	    if (defaultContent != null) {
-		NoticeboardSession newSession = new NoticeboardSession(toolSessionId, toolSessionName, defaultContent,
-			new Date(System.currentTimeMillis()), NoticeboardSession.NOT_ATTEMPTED);
-		// saveNoticeboardSession(newSession);
-		defaultContent.getNbSessions().add(newSession);
-		saveNoticeboard(defaultContent);
+	nbContent.getNbSessions().add(nbSession);
+	saveNoticeboard(nbContent);
+	// saveNoticeboardSession(nbSession);
 
-	    } else {
-		throw new ToolException("Default content is missing. Unable to create tool session");
-	    }
-	} else {
-	    NoticeboardSession nbSession = new NoticeboardSession(toolSessionId, toolSessionName, nbContent, new Date(
-		    System.currentTimeMillis()), NoticeboardSession.NOT_ATTEMPTED);
-
-	    nbContent.getNbSessions().add(nbSession);
-	    saveNoticeboard(nbContent);
-	    // saveNoticeboardSession(nbSession);
-	}
-
     }
 
     /**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -racb0851f5348ca7f4d535d181d6b35fcb539272c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision acb0851f5348ca7f4d535d181d6b35fcb539272c)
@@ -213,35 +213,16 @@
 	    throw new SubmitFilesException("Fail to set tool content to run offline - "
 		    + " based on null toolContentId");
 	}
-	try {
-	    SubmitFilesContent content = getSubmitFilesContent(toolContentId);
-	    if (content == null || !toolContentId.equals(content.getContentID())) {
-		content = duplicateDefaultToolContent(toolContentId);
-	    }
-	    content.setRunOffline(value);
-	    submitFilesContentDAO.saveOrUpdate(content);
-	} catch (DataAccessException e) {
-	    throw new SubmitFilesException("Exception occured when LAMS is setting content to run offline"
-		    + e.getMessage(), e);
+	
+	SubmitFilesContent content = getSubmitFilesContent(toolContentId);
+	if (content == null) {
+	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
 	}
+	content.setRunOffline(value);
+	submitFilesContentDAO.saveOrUpdate(content);
     }
 
     /**
-     * If the toolContentID does not exist, then get default tool content id from tool core and initialize a emtpy
-     * <code>SubmitFilesContent</code> return.
-     * 
-     * @param toolContentId
-     * @return
-     */
-    private SubmitFilesContent duplicateDefaultToolContent(Long toolContentId) {
-	long contentId = 0;
-	contentId = toolService.getToolDefaultContentIdBySignature(SbmtConstants.TOOL_SIGNATURE);
-	SubmitFilesContent content = new SubmitFilesContent();
-	content.setContentID(new Long(contentId));
-	return content;
-    }
-
-    /**
      * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long)
      */
     public void setAsDefineLater(Long toolContentId, boolean value) {
@@ -250,17 +231,13 @@
 	    throw new SubmitFilesException("Fail to set tool content to define later - "
 		    + " based on null toolContentId");
 	}
-	try {
-	    SubmitFilesContent content = getSubmitFilesContent(toolContentId);
-	    if (content == null || !toolContentId.equals(content.getContentID())) {
-		content = duplicateDefaultToolContent(toolContentId);
-	    }
-	    content.setDefineLater(value);
-	    submitFilesContentDAO.saveOrUpdate(content);
-	} catch (DataAccessException e) {
-	    throw new SubmitFilesException("Exception occured when LAMS is setting content to run define later"
-		    + e.getMessage(), e);
+	
+	SubmitFilesContent content = getSubmitFilesContent(toolContentId);
+	if (content == null) {
+	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
 	}
+	content.setDefineLater(value);
+	submitFilesContentDAO.saveOrUpdate(content);
 
     }