diff --git a/xos/synchronizer/models/convenience/cordsubscriberroot.py b/xos/synchronizer/models/convenience/rcordsubscriber.py
similarity index 77%
rename from xos/synchronizer/models/convenience/cordsubscriberroot.py
rename to xos/synchronizer/models/convenience/rcordsubscriber.py
index 57e10a4..47c29ed 100644
--- a/xos/synchronizer/models/convenience/cordsubscriberroot.py
+++ b/xos/synchronizer/models/convenience/rcordsubscriber.py
@@ -36,20 +36,6 @@
                        "cdn_enable",
                        "uplink_speed",
                        "downlink_speed",
-                       "enable_uverse",
                        "status")
 
-    # figure out what to do about "devices"... is it still needed?
-
-    def get_attribute(self, name, default=None):
-        if self.service_specific_attribute:
-            attributes = json.loads(self.service_specific_attribute)
-        else:
-            attributes = {}
-        return attributes.get(name, default)
-
-    @property
-    def devices(self):
-        return self.get_attribute("devices", [])
-
 register_convenience_wrapper("RCORDSubscriber", ORMWrapperRCORDSubscriber)
diff --git a/xos/synchronizer/models/rcord.xproto b/xos/synchronizer/models/rcord.xproto
index 9b4deb2..cc5ad60 100644
--- a/xos/synchronizer/models/rcord.xproto
+++ b/xos/synchronizer/models/rcord.xproto
@@ -20,10 +20,8 @@
     optional string url_filter_rules = 4 [default = "allow all", null = True, db_index = False, blank = True];
     optional string url_filter_level = 5 [default = "PG", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
     optional bool cdn_enable = 6 [default = False, null = False, db_index = False, blank = True];
-    optional bool is_demo_user = 7 [default = False, null = False, db_index = False, blank = True];
     optional int32 uplink_speed = 8 [default = 1000000000, null = False, db_index = False, blank = False];
     optional int32 downlink_speed = 9 [default = 1000000000, null = False, db_index = False, blank = False];
-    optional bool enable_uverse = 10 [default = True, null = False, db_index = False, blank = True];
     optional string status = 11 [default = "enabled", choices = "(('enabled', 'Enabled'), ('suspended', 'Suspended'), ('delinquent', 'Delinquent'), ('copyrightviolation', 'Copyright Violation'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
 
     // parameters for r-cord lite