diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
index b89f165db..147692c50 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
@@ -38,9 +38,9 @@ public class DataPropertyStatementTemplateModel extends BaseTemplateModel {
     private String dataPropHash = null;
 
     DataPropertyStatementTemplateModel(String subjectUri, String propertyUri, 
-            Literal value2, EditingPolicyHelper policyHelper) {
+            Literal value, EditingPolicyHelper policyHelper) {
         
-        this.value = value2;
+        this.value = value;
         
         if (policyHelper != null) {
             this.subjectUri = subjectUri;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
index cce229f54..515181890 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
@@ -9,8 +9,6 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropStmt;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjPropStmt;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index e49624b91..d6124b117 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -111,14 +111,14 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         
         if (hasDefaultListView()) {
             object = DEFAULT_LIST_VIEW_QUERY_OBJECT_VARIABLE_NAME;
-            log.debug("Using default list view for property " + getUri() + 
+            log.debug("Using default list view for property " + propertyUri + 
                       ", so query object = '" + object + "'");
         } else {
             String queryString = getQueryString();
             Matcher m = SUBJECT_PROPERTY_OBJECT_PATTERN.matcher(queryString);
             if (m.find()) {
                 object = m.group(1);
-                log.debug("Query object for property " + getUri() + " = '" + object + "'");
+                log.debug("Query object for property " + propertyUri + " = '" + object + "'");
             }
         }
         
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index ad5fc194b..9eb2aa6b9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -17,23 +17,20 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
     private static final Log log = LogFactory.getLog(PropertyTemplateModel.class); 
     
     private String name;
+    protected String propertyUri;
     
     // For editing
     protected String subjectUri = null;
-    protected String propertyUri = null;
-    protected Property property; // RY DO WE NEED THIS, or just the uri??
     protected boolean addAccess = false;
     
     PropertyTemplateModel(Property property, Individual subject, EditingPolicyHelper policyHelper) {
-        // Do in subclass constructor. The label has not been set on the property, and getting the 
-        // label differs between object and data properties.
+        // Do in subclass constructor. The label has not been set on the property, and the
+        // means of getting the label differs between object and data properties.
         // this.name = property.getLabel();
-        this.propertyUri = property.getURI();
-        this.property = property;
+        propertyUri = property.getURI();
         
         if (policyHelper != null) {
-            subjectUri = subject.getURI();
-            propertyUri = property.getURI();
+            subjectUri = subject.getURI();            
         }
     }
     
@@ -41,6 +38,11 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         this.name = name;
     }
     
+    protected String getUri() {
+        return propertyUri;
+    }
+        
+    
     /* Access methods for templates */
     
     public abstract String getType();
@@ -49,10 +51,7 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         return name;
     }
 
-    public String getUri() {
-        return propertyUri;
-    }
-    
+
     public abstract String getAddUrl();
  
 }