Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rcba500cc787cfc127fa1dbfdea56b368bbe5c388
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml	(.../ImageGallerySession.hbm.xml)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml	(.../ImageGallerySession.hbm.xml)	(revision cba500cc787cfc127fa1dbfdea56b368bbe5c388)
@@ -76,26 +76,6 @@
             length="250"
         />
 
-        <set
-            name="imageGalleryItems"
-            lazy="true"
-            inverse="false"
-            cascade="all"
-            sort="unsorted"
-            order-by="create_date desc"
-        >
-
-            <key
-                column="session_uid"
-            >
-            </key>
-
-            <one-to-many
-                  class="org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem"
-            />
-
-        </set>
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ImageGallerySession.xml
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rcba500cc787cfc127fa1dbfdea56b368bbe5c388
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java	(.../ImageGallerySession.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java	(.../ImageGallerySession.java)	(revision cba500cc787cfc127fa1dbfdea56b368bbe5c388)
@@ -48,8 +48,6 @@
     private Date sessionEndDate;
     // finish or not
     private int status;
-    // imageGallery Items
-    private Set imageGalleryItems;
 
     // **********************************************************
     // Get/Set methods
@@ -144,21 +142,4 @@
 	this.sessionName = sessionName;
     }
 
-    /**
-     * 
-     * 
-     * @hibernate.set lazy="true" inverse="false" cascade="all" order-by="create_date desc"
-     * @hibernate.collection-key column="session_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem"
-     * 
-     * @return
-     */
-    public Set getImageGalleryItems() {
-	return imageGalleryItems;
-    }
-
-    public void setImageGalleryItems(Set imageGalleryItems) {
-	this.imageGalleryItems = imageGalleryItems;
-    }
-
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
===================================================================
diff -u -r0deb16204d87ee066914a10b3b545cf25eb4d714 -rcba500cc787cfc127fa1dbfdea56b368bbe5c388
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	(.../ImageGalleryOutputFactory.java)	(revision 0deb16204d87ee066914a10b3b545cf25eb4d714)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	(.../ImageGalleryOutputFactory.java)	(revision cba500cc787cfc127fa1dbfdea56b368bbe5c388)
@@ -142,7 +142,8 @@
 		    return getNumVotes(user, session, imageGalleryService);
 		} else if (nameParts[0].equals(ImageGalleryOutputFactory.OUTPUT_NAME_UPLOADED_IMAGES_URLS)) {
 		    List<SimpleURL> uploadedImagesUrls = new ArrayList<SimpleURL>();
-		    Set<ImageGalleryItem> sessionImages = session.getImageGalleryItems();
+		    Set<ImageGalleryItem> sessionImages = imageGalleryService.getImagesForGroup(session
+			    .getImageGallery(), toolSessionId);
 		    for (ImageGalleryItem image : sessionImages) {
 			if (!image.isCreateByAuthor()) {
 			    String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r37b49e5e78d2b57936d98e68f6057539472b7725 -rcba500cc787cfc127fa1dbfdea56b368bbe5c388
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 37b49e5e78d2b57936d98e68f6057539472b7725)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision cba500cc787cfc127fa1dbfdea56b368bbe5c388)
@@ -768,13 +768,6 @@
 	image.setCreateByAuthor(false);
 	image.setHide(false);
 
-	ImageGallerySession session = service.getImageGallerySessionBySessionId(sessionId);
-	Set<ImageGalleryItem> sessionItems = session.getImageGalleryItems();
-	if (sessionItems == null) {
-	    sessionItems = new LinkedHashSet<ImageGalleryItem>();
-	}
-	sessionItems.add(image);
-
 	// setting SequenceId
 	Set<ImageGalleryItem> imageList = imageGallery.getImageGalleryItems();
 	int maxSeq = 0;