Index: WeightDAO.java
===================================================================
--- WeightDAO.java	(revision 95197)
+++ WeightDAO.java	(working copy)
@@ -28,16 +28,12 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
-import com.microsoft.hsg.Connection;
 import com.microsoft.hsg.Request;
 
 public class WeightDAO
 {
-	private Connection connection;
-	
-	public WeightDAO(Connection connection)
+	public WeightDAO()
 	{
-		this.connection = connection;
 	}
 	
 	public List<WeightInfo> getWeights()
@@ -50,7 +46,7 @@
 				WeightInfo.WeightType +
 				"</type-id></filter><format><section>core</section><xml/></format></group></info>");
 		
-		RequestTemplate template = new RequestTemplate(connection);
+		RequestTemplate template = new RequestTemplate();
 		return template.makeRequest(request, new Marshaller<List<WeightInfo>>() {
 			public List<WeightInfo> marshal(InputStream istream) throws Exception {
 				InputSource isource = new InputSource(istream);
@@ -103,7 +99,7 @@
 		request.setMethodName("PutThings");
 		request.setInfo(infoBuilder.toString());
 		
-		RequestTemplate template = new RequestTemplate(connection);
+		RequestTemplate template = new RequestTemplate();
 		template.makeRequest(request);
 	}
 }
Index: RequestTemplate.java
===================================================================
--- RequestTemplate.java	(revision 95197)
+++ RequestTemplate.java	(working copy)
@@ -19,7 +19,6 @@
 
 import org.apache.wicket.Session;
 
-import com.microsoft.hsg.Connection;
 import com.microsoft.hsg.ConnectionFactory;
 import com.microsoft.hsg.HVAccessor;
 import com.microsoft.hsg.HVException;
@@ -27,11 +26,8 @@
 
 public class RequestTemplate
 {
-	Connection connection;
-
-	public RequestTemplate(Connection connection)
+	public RequestTemplate()
 	{
-		this.connection = connection;
 	}
 	
 	public Integer makeRequest(Request request)
Index: WeightPage.java
===================================================================
--- WeightPage.java	(revision 95197)
+++ WeightPage.java	(working copy)
@@ -28,8 +28,6 @@
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.util.value.ValueMap;
 
-import com.microsoft.hsg.ConnectionFactory;
-
 /**
  * Homepage
  */
@@ -57,7 +55,7 @@
 	
 	private List<WeightInfo> getWeights()
 	{
-		WeightDAO dao = new WeightDAO(ConnectionFactory.getConnection());
+		WeightDAO dao = new WeightDAO();
 		return dao.getWeights();
 	}
   
@@ -77,7 +75,7 @@
     		
     		WeightInfo wi = new WeightInfo();
     		wi.setValue(weightInput);
-    		WeightDAO dao = new WeightDAO(ConnectionFactory.getConnection());
+    		WeightDAO dao = new WeightDAO();
     		dao.putWeight(wi);
     		thingList.setList(getWeights());
     	}