Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -rf1bd855c28fc7140f19ba963adfe51bf78157ce1
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision f1bd855c28fc7140f19ba963adfe51bf78157ce1)
@@ -430,7 +430,7 @@
 	    log = new ScratchieAnswerVisitLog();
 	    log.setQbOption(option);
 	    log.setSessionId(sessionId);
-	    QbToolQuestion qbToolQuestion = (QbToolQuestion) scratchieDao.find(QbToolQuestion.class, itemUid);
+	    QbToolQuestion qbToolQuestion = scratchieDao.find(QbToolQuestion.class, itemUid);
 	    log.setQbToolQuestion(qbToolQuestion);
 	    log.setAccessDate(new Timestamp(new Date().getTime()));
 	    scratchieAnswerVisitDao.saveObject(log);
@@ -1875,16 +1875,6 @@
 	// set ScratchieToolContentHandler as null to avoid copy file node in repository again.
 	toolContentObj = Scratchie.newInstance(toolContentObj, toolContentId);
 
-	// wipe out the links from QbOptionDTO back to ScratchieItem, or it will try to
-	// include the hibernate object version of the ScratchieItem within the XML
-	Set<ScratchieItem> items = toolContentObj.getScratchieItems();
-	for (ScratchieItem item : items) {
-	    Collection<QbOption> options = item.getQbQuestion().getQbOptions();
-	    for (QbOption option : options) {
-		option.setQbQuestion(null);
-	    }
-	}
-
 	try {
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, scratchieToolContentHandler,
 		    rootPath);