diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
index 8eb0d1ae0..b0b5109af 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
@@ -130,8 +130,8 @@ public class GtasksListFragment extends TaskListFragment {
     public Property<?>[] taskProperties() {
         Property<?>[] baseProperties = TaskAdapter.PROPERTIES;
         ArrayList<Property<?>> properties = new ArrayList<>(Arrays.asList(baseProperties));
-        properties.add(gtasksTaskListUpdater.indentProperty());
-        properties.add(gtasksTaskListUpdater.orderProperty());
+        properties.add(GtasksMetadata.INDENT);
+        properties.add(GtasksMetadata.ORDER);
         return properties.toArray(new Property<?>[properties.size()]);
     }
 
diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index e5fea8f7f..45623f8cb 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import com.todoroo.andlib.data.Property.IntegerProperty;
-import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Order;
@@ -51,18 +49,6 @@ public class GtasksTaskListUpdater {
 
     // --- overrides
 
-    protected IntegerProperty indentProperty() {
-        return GtasksMetadata.INDENT;
-    }
-
-    protected LongProperty orderProperty() {
-        return GtasksMetadata.ORDER;
-    }
-
-    protected LongProperty parentProperty() {
-        return GtasksMetadata.PARENT_TASK;
-    }
-
     protected Metadata getTaskMetadata(long taskId) {
         return metadataDao.getFirstActiveByTaskAndKey(taskId, GtasksMetadata.METADATA_KEY);
     }
@@ -172,25 +158,25 @@ public class GtasksTaskListUpdater {
             if(!metadata.isSaved()) {
                 metadata = createEmptyMetadata(list, taskId);
             }
-            int indent = metadata.containsNonNullValue(indentProperty()) ?
-                    metadata.getValue(indentProperty()) : 0;
+            int indent = metadata.containsNonNullValue(GtasksMetadata.INDENT) ?
+                    metadata.getValue(GtasksMetadata.INDENT) : 0;
 
             long order = globalOrder.incrementAndGet();
-            metadata.setValue(orderProperty(), order);
+            metadata.setValue(GtasksMetadata.ORDER, order);
 
             if(targetTaskId == taskId) {
                 // if indenting is warranted, indent me and my children
                 if(indent + delta <= previousIndent.get() + 1 && indent + delta >= 0) {
                     targetTaskIndent.set(indent);
-                    metadata.setValue(indentProperty(), indent + delta);
+                    metadata.setValue(GtasksMetadata.INDENT, indent + delta);
 
-                    if(parentProperty() != null) {
+                    if(GtasksMetadata.PARENT_TASK != null) {
                         long newParent = computeNewParent(list,
                                 taskId, indent + delta - 1);
                         if (newParent == taskId) {
-                            metadata.setValue(parentProperty(), Task.NO_ID);
+                            metadata.setValue(GtasksMetadata.PARENT_TASK, Task.NO_ID);
                         } else {
-                            metadata.setValue(parentProperty(), newParent);
+                            metadata.setValue(GtasksMetadata.PARENT_TASK, newParent);
                         }
                     }
                     saveAndUpdateModifiedDate(metadata);
@@ -200,7 +186,7 @@ public class GtasksTaskListUpdater {
                 if(indent <= targetTaskIndent.get()) {
                     targetTaskIndent.set(-1);
                 } else {
-                    metadata.setValue(indentProperty(), indent + delta);
+                    metadata.setValue(GtasksMetadata.INDENT, indent + delta);
                     saveAndUpdateModifiedDate(metadata);
                 }
             } else {
@@ -230,7 +216,7 @@ public class GtasksTaskListUpdater {
                 computedParent.set(true);
             }
 
-            int indent = metadata.getValue(indentProperty());
+            int indent = metadata.getValue(GtasksMetadata.INDENT);
             if (!computedParent.get() && indent == desiredParentIndent.get()) {
                 lastPotentialParent.set(taskId);
             }
@@ -310,13 +296,13 @@ public class GtasksTaskListUpdater {
             if(metadata == null) {
                 metadata = createEmptyMetadata(list, node.taskId);
             }
-            metadata.setValue(orderProperty(), order.getAndIncrement());
-            metadata.setValue(indentProperty(), indent);
+            metadata.setValue(GtasksMetadata.ORDER, order.getAndIncrement());
+            metadata.setValue(GtasksMetadata.INDENT, indent);
             boolean parentChanged = false;
-            if(parentProperty() != null && metadata.getValue(parentProperty()) !=
+            if(GtasksMetadata.PARENT_TASK != null && metadata.getValue(GtasksMetadata.PARENT_TASK) !=
                     node.parent.taskId) {
                 parentChanged = true;
-                metadata.setValue(parentProperty(), node.parent.taskId);
+                metadata.setValue(GtasksMetadata.PARENT_TASK, node.parent.taskId);
             }
             saveAndUpdateModifiedDate(metadata);
             if(parentChanged) {
@@ -348,7 +334,7 @@ public class GtasksTaskListUpdater {
         final AtomicReference<Node> currentNode = new AtomicReference<>(root);
 
         iterateThroughList(list, (taskId, metadata) -> {
-            int indent = metadata.getValue(indentProperty());
+            int indent = metadata.getValue(GtasksMetadata.INDENT);
 
             int previousIndentValue = previoustIndent.get();
             if(indent == previousIndentValue) { // sibling
diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
index 27d92becd..a86707cfa 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
@@ -201,7 +201,7 @@ public class OrderedMetadataListFragmentHelper {
             super.setFieldContentsAndVisibility(view);
 
             ViewHolder vh = (ViewHolder) view.getTag();
-            int indent = vh.task.getValue(updater.indentProperty());
+            int indent = vh.task.getValue(GtasksMetadata.INDENT);
             vh.rowBody.setPadding(Math.round(indent * 20 * metrics.density), 0, 0, 0);
         }
     }
@@ -230,12 +230,12 @@ public class OrderedMetadataListFragmentHelper {
         }
 
         final ArrayList<Long> chained = new ArrayList<>();
-        final int parentIndent = item.getValue(updater.indentProperty());
+        final int parentIndent = item.getValue(GtasksMetadata.INDENT);
         updater.applyToChildren(list, itemId, node -> {
             Task childTask = taskDao.fetch(node.taskId, Task.RECURRENCE);
             if(!TextUtils.isEmpty(childTask.getRecurrence())) {
                 Metadata metadata = updater.getTaskMetadata(node.taskId);
-                metadata.setValue(updater.indentProperty(), parentIndent);
+                metadata.setValue(GtasksMetadata.INDENT, parentIndent);
                 metadataDao.persist(metadata);
             }