Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -reb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8 -r8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision eb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd)
@@ -119,8 +119,6 @@
 	 */
 	public List getFilesUploadedByUser(Long userID, Long contentID);
 	
-	public void removeToolContent(Long contentID);
-	
 	/**
 	 * This method is required in the monitoring enviornment
 	 * when the teacher wants to view all the learners who have
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -reb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8 -r8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision eb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd)
@@ -47,6 +47,8 @@
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
+import org.lamsfoundation.lams.tool.exception.DataMissingException;
+import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
@@ -134,9 +136,10 @@
 	 * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long,
 	 *      java.lang.Long)
 	 */
-	public void copyToolContent(Long fromContentId, Long toContentId) {
+	public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
+	    // TODO fix this to use the default content id - shouldn't throw the exception
 		if (fromContentId == null || toContentId == null)
-			throw new SubmitFilesException(
+			throw new ToolException(
 					"Failed to create the SubmitFiles tool seession");
 
 		SubmitFilesContent fromContent = submitFilesContentDAO
@@ -171,11 +174,11 @@
 	 * 
 	 * @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long)
 	 */
-	public void removeToolContent(Long toolContentId)throws SubmitFilesException{
+	public void removeToolContent(Long toolContentId, boolean removeSessionData)throws DataMissingException {
 		SubmitFilesContent submitFilesContent = submitFilesContentDAO
 				.getContentByID(toolContentId);
 		if (submitFilesContent == null)
-			throw new SubmitFilesException(
+			throw new DataMissingException(
 					"No such content with a contentID of : " + toolContentId
 							+ " exists");
 		else {
@@ -190,6 +193,7 @@
 				submitFilesContentDAO.delete(submitFilesContent);
 			}			
 		}
+		//TODO check for related session data and delete as appropriate
 	}
 
 	/**
@@ -417,6 +421,17 @@
 	/**
 	 * (non-Javadoc)
 	 * 
+	 * @see org.lamsfoundation.lams.tool.ToolSessionManager#removeToolSession(java.lang.Long)
+	 */
+	public void removeToolSession(Long toolSessionId)
+	   throws DataMissingException, ToolException{
+			// TODO Auto-generated method stub
+			return;
+	}
+	
+	/**
+	 * (non-Javadoc)
+	 * 
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#uploadFile(java.lang.Long,
 	 *      java.lang.String, java.lang.String)
 	 */