Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -rb278d6220cf3c9716e5582ba31343c3bf4e3c2ab -r8b9be0855cd8fe05070e4732334dfaadd573de4e
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision b278d6220cf3c9716e5582ba31343c3bf4e3c2ab)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml	(.../Tool.hbm.xml)	(revision 8b9be0855cd8fe05070e4732334dfaadd573de4e)
@@ -248,19 +248,5 @@
             class="org.lamsfoundation.lams.learningdesign.Activity"
         />
     </set>
-    
-    <set 
-    	name="mappedServers" 
-    	lazy="false"
-    	inverse="false" 
-    	cascade="none" 
-    	sort="unsorted" >
-    <cache usage="transactional" />
-
-    	
-		<key column="tool_id"></key>
-		<one-to-many class="org.lamsfoundation.lams.integration.ExtServerToolAdapterMap"/>
-	</set>
-
 </class>
 </hibernate-mapping>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r8b9be0855cd8fe05070e4732334dfaadd573de4e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java	(.../LibraryActivityDTO.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java	(.../LibraryActivityDTO.java)	(revision 8b9be0855cd8fe05070e4732334dfaadd573de4e)
@@ -24,9 +24,7 @@
 package org.lamsfoundation.lams.learningdesign.dto;
 
 import java.util.Date;
-import java.util.Set;
 
-import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.BranchingActivity;
 import org.lamsfoundation.lams.learningdesign.ConditionGateActivity;
@@ -105,8 +103,6 @@
     /** Used for I18N the URLS. Does not need to be sent to clients, so no getter exists. */
     private String languageCode;
 
-    private String[] mappedServers;
-
     public LibraryActivityDTO(Activity activity, String languageCode) {
 	activityTypeID = activity.getActivityTypeId();
 	activityID = activity.getActivityId();
@@ -204,16 +200,6 @@
 	    supportsOutputs = tool.getSupportsOutputs();
 	    extLmsId = tool.getExtLmsId();
 
-	    Set<ExtServerToolAdapterMap> mappedServersArray = tool.getMappedServers();
-	    if (mappedServersArray != null) {
-		this.mappedServers = new String[mappedServersArray.size()];
-		int i = 0;
-		for (ExtServerToolAdapterMap map : mappedServersArray) {
-		    mappedServers[i] = map.getExtServer().getServerid();
-		    i++;
-		}
-	    }
-
 	    helpURL = HelpUtil.constructToolURL(tool.getHelpUrl(), toolSignature, "", languageCode);
 	}
 
@@ -328,7 +314,7 @@
     }
 
     /**
-     * 
+     *
      * @return Return the helpURL
      */
     public String getHelpURL() {
@@ -455,7 +441,7 @@
     }
 
     /**
-     * 
+     *
      * @return Returns the toolSignature
      */
     public String getToolSignature() {
@@ -555,7 +541,7 @@
 
     /**
      * Set the activity's help url
-     * 
+     *
      * @param helpURL
      */
     public void setHelpURL(String helpURL) {
@@ -574,7 +560,7 @@
 
     /**
      * Set the tool's signature
-     * 
+     *
      * @param toolSignature
      */
 
@@ -597,13 +583,4 @@
     public void setExtLmsId(String extLmsId) {
 	this.extLmsId = extLmsId;
     }
-
-    public String[] getMappedServers() {
-	return mappedServers;
-    }
-
-    public void setMappedServers(String[] mappedServers) {
-	this.mappedServers = mappedServers;
-    }
-
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -rd966398218b421b81531d394d52526cffb8d1e3a -r8b9be0855cd8fe05070e4732334dfaadd573de4e
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	(.../Tool.java)	(revision d966398218b421b81531d394d52526cffb8d1e3a)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	(.../Tool.java)	(revision 8b9be0855cd8fe05070e4732334dfaadd573de4e)
@@ -90,9 +90,6 @@
     private Set activities;
 
     /** persistent field */
-    private Set<ExtServerToolAdapterMap> mappedServers;
-
-    /** persistent field */
     private Integer groupingSupportTypeId;
 
     /** persistent field */
@@ -152,7 +149,6 @@
 	this.languageFile = languageFile;
 	this.supportsOutputs = supportsOutputs;
 	this.extLmsId = extLmsId;
-	this.mappedServers = new HashSet<ExtServerToolAdapterMap>();
     }
 
     /** default constructor */
@@ -176,7 +172,6 @@
 	this.createDateTime = createDateTime;
 	this.toolIdentifier = toolIdentifier;
 	this.toolVersion = toolVersion;
-	this.mappedServers = new HashSet<ExtServerToolAdapterMap>();
     }
 
     public Long getToolId() {
@@ -436,9 +431,9 @@
 
     public IToolVO createBasicToolVO() {
 	IToolVO vo = new BasicToolVO(toolId, supportsGrouping, learnerUrl, learnerPreviewUrl, learnerProgressUrl,
-		authorUrl, monitorUrl, helpUrl, defaultToolContentId, learningLibraryId, toolSignature, toolDisplayName, description,
-		serviceName, createDateTime, groupingSupportTypeId, toolIdentifier, toolVersion, languageFile,
-		extLmsId);
+		authorUrl, monitorUrl, helpUrl, defaultToolContentId, learningLibraryId, toolSignature, toolDisplayName,
+		description, serviceName, createDateTime, groupingSupportTypeId, toolIdentifier, toolVersion,
+		languageFile, extLmsId);
 	return vo;
     }
 
@@ -449,12 +444,4 @@
     public void setPedagogicalPlannerUrl(String pedagogicalPlannerUrl) {
 	this.pedagogicalPlannerUrl = pedagogicalPlannerUrl;
     }
-
-    public Set<ExtServerToolAdapterMap> getMappedServers() {
-	return mappedServers;
-    }
-
-    public void setMappedServers(Set<ExtServerToolAdapterMap> mappedServers) {
-	this.mappedServers = mappedServers;
-    }
-}
+}
\ No newline at end of file