diff --git a/xos/genx/protos/core/Slice.proto b/xos/genx/protos/core/Slice.proto
deleted file mode 100644
index db788fe..0000000
--- a/xos/genx/protos/core/Slice.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-
-message Slice {
-  required string name = 1 [ null = False,  max_length = 80,  content_type = "stripped",  blank = False,  help_text = "The Name of the Slice",  modifier = required,  db_index = False ];
-  required bool enabled = 2 [ null = False,  default = True,  blank = True,  help_text = "Status for this Slice",  modifier = required,  db_index = False ];
-  required bool omf_friendly = 3 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  required string description = 4 [ null = False,  max_length = 1024,  blank = True,  help_text = "High level description of the slice and expected activities",  modifier = required,  db_index = False ];
-  required string slice_url = 5 [ null = False,  max_length = 512,  content_type = "url",  blank = True,  modifier = required,  db_index = False ];
-  required int32 site = 6 [ null = False,  blank = False,  help_text = "The Site this Slice belongs to",  model = Site,  modifier = required,  type = link,  port = slices,  db_index = True ];
-  required int32 max_instances = 7 [ db_index = False,  default = 10,  modifier = required,  null = False,  blank = False ];
-  optional int32 service = 8 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = slices,  db_index = True ];
-  optional string network = 9 [ null = True,  choices = "((None, 'Default'), ('host', 'Host'), ('bridged', 'Bridged'), ('noauto', 'No Automatic Networks'))",  max_length = 256,  blank = True,  modifier = optional,  db_index = False ];
-  optional string exposed_ports = 10 [ db_index = False,  max_length = 256,  modifier = optional,  null = True,  blank = True ];
-  optional int32 serviceClass = 11 [ null = True,  blank = True,  model = ServiceClass,  modifier = optional,  type = link,  port = slices,  db_index = True ];
-  optional int32 creator = 12 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = slices,  db_index = True ];
-  optional int32 default_flavor = 13 [ null = True,  blank = True,  model = Flavor,  modifier = optional,  type = link,  port = slices,  db_index = True ];
-  optional int32 default_image = 14 [ null = True,  blank = True,  model = Image,  modifier = optional,  type = link,  port = slices,  db_index = True ];
-  optional int32 default_node = 15 [ null = True,  blank = True,  model = Node,  modifier = optional,  type = link,  port = slices,  db_index = True ];
-  optional string mount_data_sets = 16 [ null = True,  default = "GenBank",  max_length = 256,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string default_isolation = 17 [ null = False,  default = "vm",  choices = "(('vm', 'Virtual Machine'), ('container', 'Container'), ('container_vm', 'Container In VM'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/account.proto b/xos/genx/protos/core/account.proto
deleted file mode 100644
index 0a011be..0000000
--- a/xos/genx/protos/core/account.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message Account {
-  required int32 site = 1 [ null = False,  blank = False,  help_text = "Site for this account",  model = Site,  modifier = required,  type = link,  port = accounts,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/addresspool.proto b/xos/genx/protos/core/addresspool.proto
deleted file mode 100644
index daf7f7c..0000000
--- a/xos/genx/protos/core/addresspool.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-
-message AddressPool {
-  required string name = 1 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = False ];
-  optional string addresses = 2 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string gateway_ip = 3 [ db_index = False,  max_length = 32,  modifier = optional,  null = True,  blank = False ];
-  optional string gateway_mac = 4 [ db_index = False,  max_length = 32,  modifier = optional,  null = True,  blank = False ];
-  optional string cidr = 5 [ db_index = False,  max_length = 32,  modifier = optional,  null = True,  blank = False ];
-  optional string inuse = 6 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 service = 7 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = addresspools,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controller.proto b/xos/genx/protos/core/controller.proto
deleted file mode 100644
index fabf0c1..0000000
--- a/xos/genx/protos/core/controller.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-
-message Controller {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of the Controller",  modifier = required,  db_index = False ];
-  required string backend_type = 2 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Type of compute controller, e.g. EC2, OpenStack, or OpenStack version",  modifier = required,  db_index = False ];
-  required string version = 3 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Controller version",  modifier = required,  db_index = False ];
-  optional string auth_url = 4 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Auth url for the compute controller",  modifier = optional,  db_index = False ];
-  optional string admin_user = 5 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Username of an admin user at this controller",  modifier = optional,  db_index = False ];
-  optional string admin_password = 6 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Password of theadmin user at this controller",  modifier = optional,  db_index = False ];
-  optional string admin_tenant = 7 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Name of the tenant the admin user belongs to",  modifier = optional,  db_index = False ];
-  optional string domain = 8 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Name of the domain this controller belongs to",  modifier = optional,  db_index = False ];
-  optional string rabbit_host = 9 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "IP address of rabbitmq server at this controller",  modifier = optional,  db_index = False ];
-  optional string rabbit_user = 10 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Username of rabbitmq server at this controller",  modifier = optional,  db_index = False ];
-  optional string rabbit_password = 11 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Password of rabbitmq server at this controller",  modifier = optional,  db_index = False ];
-  required int32 deployment = 12 [ null = False,  blank = False,  model = Deployment,  modifier = required,  type = link,  port = controllerdeployments,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllerdashboardview.proto b/xos/genx/protos/core/controllerdashboardview.proto
deleted file mode 100644
index 6791403..0000000
--- a/xos/genx/protos/core/controllerdashboardview.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message ControllerDashboardView {
-  required int32 controller = 1 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllerdashboardviews,  db_index = True ];
-  required int32 dashboardView = 2 [ null = False,  blank = False,  model = DashboardView,  modifier = required,  type = link,  port = controllerdashboardviews,  db_index = True ];
-  required bool enabled = 3 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string url = 4 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "URL of Dashboard",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllerimages.proto b/xos/genx/protos/core/controllerimages.proto
deleted file mode 100644
index 6539604..0000000
--- a/xos/genx/protos/core/controllerimages.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ControllerImages {
-  required int32 image = 1 [ null = False,  blank = False,  model = Image,  modifier = required,  type = link,  port = controllerimages,  db_index = True ];
-  required int32 controller = 2 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllerimages,  db_index = True ];
-  optional string glance_image_id = 3 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Glance image id",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllernetwork.proto b/xos/genx/protos/core/controllernetwork.proto
deleted file mode 100644
index 151659f..0000000
--- a/xos/genx/protos/core/controllernetwork.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-
-message ControllerNetwork {
-  required int32 network = 1 [ null = False,  blank = False,  model = Network,  modifier = required,  type = link,  port = controllernetworks,  db_index = True ];
-  required int32 controller = 2 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllernetworks,  db_index = True ];
-  required string subnet = 3 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = True ];
-  required string start_ip = 4 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = True ];
-  required string stop_ip = 5 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = True ];
-  optional string net_id = 6 [ null = True,  max_length = 256,  blank = True,  help_text = "Neutron network",  modifier = optional,  db_index = False ];
-  optional string router_id = 7 [ null = True,  max_length = 256,  blank = True,  help_text = "Neutron router id",  modifier = optional,  db_index = False ];
-  optional string subnet_id = 8 [ null = True,  max_length = 256,  blank = True,  help_text = "Neutron subnet id",  modifier = optional,  db_index = False ];
-  optional string gateway = 9 [ db_index = False,  max_length = 32,  modifier = optional,  null = True,  blank = True ];
-  optional string segmentation_id = 10 [ db_index = False,  max_length = 32,  modifier = optional,  null = True,  blank = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllerrole.proto b/xos/genx/protos/core/controllerrole.proto
deleted file mode 100644
index bd9bf13..0000000
--- a/xos/genx/protos/core/controllerrole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message ControllerRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'),)",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllersite.proto b/xos/genx/protos/core/controllersite.proto
deleted file mode 100644
index 97f8ac3..0000000
--- a/xos/genx/protos/core/controllersite.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ControllerSite {
-  required int32 site = 1 [ null = False,  blank = False,  model = Site,  modifier = required,  type = link,  port = controllersite,  db_index = True ];
-  optional int32 controller = 2 [ null = True,  blank = True,  model = Controller,  modifier = optional,  type = link,  port = controllersite,  db_index = True ];
-  optional string tenant_id = 3 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Keystone tenant id",  modifier = optional,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllersiteprivilege.proto b/xos/genx/protos/core/controllersiteprivilege.proto
deleted file mode 100644
index 6814fc7..0000000
--- a/xos/genx/protos/core/controllersiteprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ControllerSitePrivilege {
-  required int32 controller = 1 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllersiteprivileges,  db_index = True ];
-  required int32 site_privilege = 2 [ null = False,  blank = False,  model = SitePrivilege,  modifier = required,  type = link,  port = controllersiteprivileges,  db_index = True ];
-  optional string role_id = 3 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Keystone id",  modifier = optional,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllerslice.proto b/xos/genx/protos/core/controllerslice.proto
deleted file mode 100644
index 16b7346..0000000
--- a/xos/genx/protos/core/controllerslice.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ControllerSlice {
-  required int32 controller = 1 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllerslices,  db_index = True ];
-  required int32 slice = 2 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = controllerslices,  db_index = True ];
-  optional string tenant_id = 3 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Keystone tenant id",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controllersliceprivilege.proto b/xos/genx/protos/core/controllersliceprivilege.proto
deleted file mode 100644
index 4dec7f2..0000000
--- a/xos/genx/protos/core/controllersliceprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ControllerSlicePrivilege {
-  required int32 controller = 1 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllersliceprivileges,  db_index = True ];
-  required int32 slice_privilege = 2 [ null = False,  blank = False,  model = SlicePrivilege,  modifier = required,  type = link,  port = controllersliceprivileges,  db_index = True ];
-  optional string role_id = 3 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Keystone id",  modifier = optional,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/controlleruser.proto b/xos/genx/protos/core/controlleruser.proto
deleted file mode 100644
index fdf4eca..0000000
--- a/xos/genx/protos/core/controlleruser.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ControllerUser {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = controllerusers,  db_index = True ];
-  required int32 controller = 2 [ null = False,  blank = False,  model = Controller,  modifier = required,  type = link,  port = controllersusers,  db_index = True ];
-  optional string kuser_id = 3 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Keystone user id",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/dashboardview.proto b/xos/genx/protos/core/dashboardview.proto
deleted file mode 100644
index 097a31c..0000000
--- a/xos/genx/protos/core/dashboardview.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-message DashboardView {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of the View",  modifier = required,  db_index = False ];
-  required string url = 2 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "URL of Dashboard",  modifier = required,  db_index = False ];
-  required bool enabled = 3 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string icon = 4 [ null = False,  default = "default-icon.png",  max_length = 200,  blank = False,  help_text = "Icon for Dashboard",  modifier = required,  db_index = False ];
-  required string icon_active = 5 [ null = False,  default = "default-icon-active.png",  max_length = 200,  blank = False,  help_text = "Icon for active Dashboard",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/deployment.proto b/xos/genx/protos/core/deployment.proto
deleted file mode 100644
index 010c9c2..0000000
--- a/xos/genx/protos/core/deployment.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message Deployment {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of the Deployment",  modifier = required,  db_index = False ];
-  required string accessControl = 2 [ null = False,  default = "allow all",  max_length = 200,  blank = False,  help_text = "Access control list that specifies which sites/users may use nodes in this deployment",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/deploymentprivilege.proto b/xos/genx/protos/core/deploymentprivilege.proto
deleted file mode 100644
index 9e030a5..0000000
--- a/xos/genx/protos/core/deploymentprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message DeploymentPrivilege {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = deploymentprivileges,  db_index = True ];
-  required int32 deployment = 2 [ null = False,  blank = False,  model = Deployment,  modifier = required,  type = link,  port = deploymentprivileges,  db_index = True ];
-  required int32 role = 3 [ null = False,  blank = False,  model = DeploymentRole,  modifier = required,  type = link,  port = deploymentprivileges,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/deploymentrole.proto b/xos/genx/protos/core/deploymentrole.proto
deleted file mode 100644
index 378f207..0000000
--- a/xos/genx/protos/core/deploymentrole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message DeploymentRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'),)",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/diag.proto b/xos/genx/protos/core/diag.proto
deleted file mode 100644
index 4d829ab..0000000
--- a/xos/genx/protos/core/diag.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message Diag {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of the synchronizer",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/flavor.proto b/xos/genx/protos/core/flavor.proto
deleted file mode 100644
index 9c8c16e..0000000
--- a/xos/genx/protos/core/flavor.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-message Flavor {
-  required string name = 1 [ null = False,  max_length = 32,  content_type = "stripped",  blank = False,  help_text = "name of this flavor, as displayed to users",  modifier = required,  db_index = False ];
-  optional string description = 2 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string flavor = 3 [ null = False,  max_length = 32,  content_type = "stripped",  blank = False,  help_text = "flavor string used to configure deployments",  modifier = required,  db_index = False ];
-  required int32 order = 4 [ null = False,  default = 0,  blank = False,  help_text = "used to order flavors when displayed in a list",  modifier = required,  db_index = False ];
-  required bool default = 5 [ null = False,  default = False,  blank = True,  help_text = "make this a default flavor to use when creating new instances",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/image.proto b/xos/genx/protos/core/image.proto
deleted file mode 100644
index b0e6b9e..0000000
--- a/xos/genx/protos/core/image.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-message Image {
-  required string name = 1 [ null = False,  max_length = 256,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "vm",  choices = "(('vm', 'Virtual Machine'), ('container', 'Container'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  required string disk_format = 3 [ null = False,  max_length = 256,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string container_format = 4 [ null = False,  max_length = 256,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string path = 5 [ null = True,  max_length = 256,  content_type = "stripped",  blank = True,  help_text = "Path to image on local disk",  modifier = optional,  db_index = False ];
-  optional string tag = 6 [ null = True,  max_length = 256,  content_type = "stripped",  blank = True,  help_text = "For Docker Images, tag of image",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/imagedeployments.proto b/xos/genx/protos/core/imagedeployments.proto
deleted file mode 100644
index 5cb9814..0000000
--- a/xos/genx/protos/core/imagedeployments.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message ImageDeployments {
-  required int32 image = 1 [ null = False,  blank = False,  model = Image,  modifier = required,  type = link,  port = imagedeployments,  db_index = True ];
-  required int32 deployment = 2 [ null = False,  blank = False,  model = Deployment,  modifier = required,  type = link,  port = imagedeployments,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/instance.proto b/xos/genx/protos/core/instance.proto
deleted file mode 100644
index 0c2f215..0000000
--- a/xos/genx/protos/core/instance.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-
-message Instance {
-  optional string instance_id = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Nova instance id",  modifier = optional,  db_index = False ];
-  optional string instance_uuid = 2 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "Nova instance uuid",  modifier = optional,  db_index = False ];
-  required string name = 3 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Instance name",  modifier = required,  db_index = False ];
-  optional string instance_name = 4 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "OpenStack generated name",  modifier = optional,  db_index = False ];
-  optional string ip = 5 [ null = True,  max_length = 39,  content_type = "ip",  blank = True,  help_text = "Instance ip address",  modifier = optional,  db_index = False ];
-  required int32 image = 6 [ null = False,  blank = False,  model = Image,  modifier = required,  type = link,  port = instances,  db_index = True ];
-  optional int32 creator = 7 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = instances,  db_index = True ];
-  required int32 slice = 8 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = instances,  db_index = True ];
-  required int32 deployment = 9 [ null = False,  blank = False,  model = Deployment,  modifier = required,  type = link,  port = instance_deployment,  db_index = True ];
-  required int32 node = 10 [ null = False,  blank = False,  model = Node,  modifier = required,  type = link,  port = instances,  db_index = True ];
-  required int32 numberCores = 11 [ null = False,  default = 0,  blank = False,  help_text = "Number of cores for instance",  modifier = required,  db_index = False ];
-  required int32 flavor = 12 [ null = False,  default = "get_default_flavor()",  blank = False,  help_text = "Flavor of this instance",  model = Flavor,  modifier = required,  type = link,  port = instance,  db_index = True ];
-  optional string userData = 13 [ db_index = False,  help_text = "user_data passed to instance during creation",  modifier = optional,  null = True,  blank = True ];
-  required string isolation = 14 [ null = False,  default = "vm",  choices = "(('vm', 'Virtual Machine'), ('container', 'Container'), ('container_vm', 'Container In VM'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  optional string volumes = 15 [ db_index = False,  help_text = "Comma-separated list of directories to expose to parent context",  modifier = optional,  null = True,  blank = True ];
-  optional int32 parent = 16 [ null = True,  blank = True,  help_text = "Parent Instance for containers nested inside of VMs",  model = Instance,  modifier = optional,  type = link,  port = instance,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/invoice.proto b/xos/genx/protos/core/invoice.proto
deleted file mode 100644
index 9a10717..0000000
--- a/xos/genx/protos/core/invoice.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message Invoice {
-  required string date = 1 [ db_index = False,  modifier = required,  null = False,  content_type = "date",  blank = False ];
-  required int32 account = 2 [ null = False,  blank = False,  model = Account,  modifier = required,  type = link,  port = invoices,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/library.proto b/xos/genx/protos/core/library.proto
deleted file mode 100644
index 67ed5c0..0000000
--- a/xos/genx/protos/core/library.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-message Library {
-  required int32 xos = 1 [ null = False,  default = "get_xos()",  blank = False,  help_text = "Pointer to XOS",  model = XOS,  modifier = required,  type = link,  port = loadable_modules,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string base_url = 3 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "Base URL, allows use of relative URLs for resources",  modifier = optional,  db_index = False ];
-  optional string version = 4 [ null = True,  default = "1.0.0",  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Controller",  modifier = optional,  db_index = False ];
-  optional string provides = 5 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of things provided",  modifier = optional,  db_index = False ];
-  optional string requires = 6 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of required Service Controllers",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/loadablemodule.proto b/xos/genx/protos/core/loadablemodule.proto
deleted file mode 100644
index 0fd55f3..0000000
--- a/xos/genx/protos/core/loadablemodule.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-message LoadableModule {
-  required int32 xos = 1 [ null = False,  default = "get_xos()",  blank = False,  help_text = "Pointer to XOS",  model = XOS,  modifier = required,  type = link,  port = loadable_modules,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string base_url = 3 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "Base URL, allows use of relative URLs for resources",  modifier = optional,  db_index = False ];
-  optional string version = 4 [ null = True,  default = "1.0.0",  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Controller",  modifier = optional,  db_index = False ];
-  optional string provides = 5 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of things provided",  modifier = optional,  db_index = False ];
-  optional string requires = 6 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of required Service Controllers",  modifier = optional,  db_index = False ];
-}
diff --git a/xos/genx/protos/core/loadablemoduleresource.proto b/xos/genx/protos/core/loadablemoduleresource.proto
deleted file mode 100644
index ccef647..0000000
--- a/xos/genx/protos/core/loadablemoduleresource.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-message LoadableModuleResource {
-  required int32 loadable_module = 1 [ null = False,  blank = False,  help_text = "The Loadable Module this resource is associated with",  model = LoadableModule,  modifier = required,  type = link,  port = loadable_module_resources,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Object Name",  modifier = required,  db_index = False ];
-  optional string subdirectory = 3 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "optional subdirectory",  modifier = optional,  db_index = False ];
-  required string kind = 4 [ null = False,  choices = "(('models', 'Models'), ('admin', 'Admin'), ('admin_template', 'Admin Template'), ('django_library', 'Django Library'), ('synchronizer', 'Synchronizer'), ('rest_service', 'REST API (service)'), ('rest_tenant', 'REST API (tenant)'), ('tosca_custom_types', 'Tosca Custom Types'), ('tosca_resource', 'Tosca Resource'), ('private_key', 'Private Key'), ('public_key', 'Public Key'), ('vendor_js', 'Vendor Javascript'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string format = 5 [ null = False,  choices = "(('python', 'Python'), ('manifest', 'Manifest'), ('docker', 'Docker Container'), ('yaml', 'YAML'), ('raw', 'raw'), ('javascript', 'Javascript'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string url = 6 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "URL of resource",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/network.proto b/xos/genx/protos/core/network.proto
deleted file mode 100644
index facb4bd..0000000
--- a/xos/genx/protos/core/network.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-
-message Network {
-  required string name = 1 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = False ];
-  required int32 template = 2 [ null = False,  blank = False,  model = NetworkTemplate,  modifier = required,  type = link,  port = network,  db_index = True ];
-  required string subnet = 3 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = True ];
-  required string start_ip = 4 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = True ];
-  required string end_ip = 5 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = True ];
-  optional string ports = 6 [ db_index = False,  max_length = 1024,  modifier = optional,  null = True,  blank = True ];
-  optional string labels = 7 [ db_index = False,  max_length = 1024,  modifier = optional,  null = True,  blank = True ];
-  required int32 owner = 8 [ null = False,  blank = False,  help_text = "Slice that owns control of this Network",  model = Slice,  modifier = required,  type = link,  port = ownedNetworks,  db_index = True ];
-  required int32 guaranteed_bandwidth = 9 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-  required bool permit_all_slices = 10 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  optional string topology_parameters = 11 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string controller_url = 12 [ db_index = False,  max_length = 1024,  modifier = optional,  null = True,  blank = True ];
-  optional string controller_parameters = 13 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string network_id = 14 [ null = True,  max_length = 256,  blank = True,  help_text = "Quantum network",  modifier = optional,  db_index = False ];
-  optional string router_id = 15 [ null = True,  max_length = 256,  blank = True,  help_text = "Quantum router id",  modifier = optional,  db_index = False ];
-  optional string subnet_id = 16 [ null = True,  max_length = 256,  blank = True,  help_text = "Quantum subnet id",  modifier = optional,  db_index = False ];
-  required bool autoconnect = 17 [ null = False,  default = True,  blank = True,  help_text = "This network can be autoconnected to the slice that owns it",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/networkparameter.proto b/xos/genx/protos/core/networkparameter.proto
deleted file mode 100644
index 9394e75..0000000
--- a/xos/genx/protos/core/networkparameter.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message NetworkParameter {
-  required int32 parameter = 1 [ null = False,  blank = False,  help_text = "The type of the parameter",  model = NetworkParameterType,  modifier = required,  type = link,  port = networkparameters,  db_index = True ];
-  required string value = 2 [ null = False,  max_length = 1024,  blank = False,  help_text = "The value of this parameter",  modifier = required,  db_index = False ];
-  required int32 content_type = 3 [ null = False,  blank = False,  model = ContentType,  modifier = required,  type = link,  port = networkparameter,  db_index = True ];
-  required uint32 object_id = 4 [ db_index = False,  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/networkparametertype.proto b/xos/genx/protos/core/networkparametertype.proto
deleted file mode 100644
index 2f9e87b..0000000
--- a/xos/genx/protos/core/networkparametertype.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message NetworkParameterType {
-  required string name = 1 [ null = False,  max_length = 128,  blank = False,  help_text = "The name of this parameter",  modifier = required,  db_index = True ];
-  required string description = 2 [ db_index = False,  max_length = 1024,  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/networkslice.proto b/xos/genx/protos/core/networkslice.proto
deleted file mode 100644
index fb697a7..0000000
--- a/xos/genx/protos/core/networkslice.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message NetworkSlice {
-  required int32 network = 1 [ null = False,  blank = False,  model = Network,  modifier = required,  type = link,  port = networkslices,  db_index = True ];
-  required int32 slice = 2 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = networkslices,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/networktemplate.proto b/xos/genx/protos/core/networktemplate.proto
deleted file mode 100644
index 44eaddd..0000000
--- a/xos/genx/protos/core/networktemplate.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-
-message NetworkTemplate {
-  required string name = 1 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = False ];
-  optional string description = 2 [ db_index = False,  max_length = 1024,  modifier = optional,  null = True,  blank = True ];
-  required int32 guaranteed_bandwidth = 3 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-  required string visibility = 4 [ null = False,  default = "private",  choices = "(('public', 'public'), ('private', 'private'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  required string translation = 5 [ null = False,  default = "none",  choices = "(('none', 'none'), ('NAT', 'NAT'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  optional string access = 6 [ null = True,  choices = "((None, 'None'), ('indirect', 'Indirect'), ('direct', 'Direct'))",  max_length = 30,  blank = True,  help_text = "Advertise this network as a means for other slices to contact this slice",  modifier = optional,  db_index = False ];
-  optional string shared_network_name = 7 [ db_index = False,  max_length = 30,  modifier = optional,  null = True,  blank = True ];
-  optional string shared_network_id = 8 [ null = True,  max_length = 256,  blank = True,  help_text = "Quantum network",  modifier = optional,  db_index = False ];
-  required string topology_kind = 9 [ null = False,  default = "bigswitch",  choices = "(('bigswitch', 'BigSwitch'), ('physical', 'Physical'), ('custom', 'Custom'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  optional string controller_kind = 10 [ null = True,  choices = "((None, 'None'), ('onos', 'ONOS'), ('custom', 'Custom'))",  max_length = 30,  blank = True,  modifier = optional,  db_index = False ];
-  optional string vtn_kind = 11 [ null = True,  default = "PRIVATE",  choices = "(('PRIVATE', 'Private'), ('PUBLIC', 'Public'), ('MANAGEMENT_LOCAL', 'Management Local'), ('MANAGEMENT_HOST', 'Management Host'), ('VSG', 'VSG'), ('ACCESS_AGENT', 'Access Agent'))",  max_length = 30,  blank = True,  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/node.proto b/xos/genx/protos/core/node.proto
deleted file mode 100644
index 9db6515..0000000
--- a/xos/genx/protos/core/node.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message Node {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of the Node",  modifier = required,  db_index = False ];
-  required int32 site_deployment = 2 [ null = False,  blank = False,  model = SiteDeployment,  modifier = required,  type = link,  port = nodes,  db_index = True ];
-  optional int32 site = 3 [ null = True,  blank = True,  model = Site,  modifier = optional,  type = link,  port = nodes,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/nodelabel.proto b/xos/genx/protos/core/nodelabel.proto
deleted file mode 100644
index 4fdaa76..0000000
--- a/xos/genx/protos/core/nodelabel.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message NodeLabel {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "label name",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/port.proto b/xos/genx/protos/core/port.proto
deleted file mode 100644
index b3a84b9..0000000
--- a/xos/genx/protos/core/port.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-message Port {
-  required int32 network = 1 [ null = False,  blank = False,  model = Network,  modifier = required,  type = link,  port = links,  db_index = True ];
-  optional int32 instance = 2 [ null = True,  blank = True,  model = Instance,  modifier = optional,  type = link,  port = ports,  db_index = True ];
-  optional string ip = 3 [ null = True,  max_length = 39,  content_type = "ip",  blank = True,  help_text = "Instance ip address",  modifier = optional,  db_index = False ];
-  optional string port_id = 4 [ null = True,  max_length = 256,  blank = True,  help_text = "Neutron port id",  modifier = optional,  db_index = False ];
-  optional string mac = 5 [ null = True,  max_length = 256,  blank = True,  help_text = "MAC address associated with this port",  modifier = optional,  db_index = False ];
-  required bool xos_created = 6 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/program.proto b/xos/genx/protos/core/program.proto
deleted file mode 100644
index 4f685fc..0000000
--- a/xos/genx/protos/core/program.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-
-message Program {
-  required string name = 1 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string description = 2 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required string kind = 3 [ null = False,  choices = "(('tosca', 'Tosca'),)",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  optional string command = 4 [ null = True,  choices = "(('run', 'Run'), ('destroy', 'Destroy'))",  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Command to run",  modifier = optional,  db_index = False ];
-  optional int32 owner = 5 [ null = True,  blank = False,  model = User,  modifier = optional,  type = link,  port = programs,  db_index = True ];
-  optional string contents = 6 [ db_index = False,  help_text = "Contents of Program",  modifier = optional,  null = True,  blank = True ];
-  optional string output = 7 [ db_index = False,  help_text = "Output of Program",  modifier = optional,  null = True,  blank = True ];
-  optional string messages = 8 [ db_index = False,  help_text = "Debug messages",  modifier = optional,  null = True,  blank = True ];
-  optional string status = 9 [ null = True,  max_length = 30,  blank = True,  help_text = "Status of program",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/project.proto b/xos/genx/protos/core/project.proto
deleted file mode 100644
index b803895..0000000
--- a/xos/genx/protos/core/project.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message Project {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of Project",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/reservation.proto b/xos/genx/protos/core/reservation.proto
deleted file mode 100644
index 8cc18d0..0000000
--- a/xos/genx/protos/core/reservation.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message Reservation {
-  required string startTime = 1 [ db_index = False,  modifier = required,  null = False,  content_type = "date",  blank = False ];
-  required int32 slice = 2 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = reservations,  db_index = True ];
-  required int32 duration = 3 [ db_index = False,  default = 1,  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/reservedresource.proto b/xos/genx/protos/core/reservedresource.proto
deleted file mode 100644
index 33bcf08..0000000
--- a/xos/genx/protos/core/reservedresource.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message ReservedResource {
-  required int32 instance = 1 [ null = False,  blank = False,  model = Instance,  modifier = required,  type = link,  port = reservedresources,  db_index = True ];
-  required int32 resource = 2 [ null = False,  blank = False,  model = ServiceResource,  modifier = required,  type = link,  port = reservedresources,  db_index = True ];
-  required int32 quantity = 3 [ db_index = False,  default = 1,  modifier = required,  null = False,  blank = False ];
-  required int32 reservationSet = 4 [ null = False,  blank = False,  model = Reservation,  modifier = required,  type = link,  port = reservedresources,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/role.proto b/xos/genx/protos/core/role.proto
deleted file mode 100644
index ae3539a..0000000
--- a/xos/genx/protos/core/role.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message Role {
-  required string role_type = 1 [ null = False,  max_length = 80,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string role = 2 [ null = True,  max_length = 80,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string description = 3 [ null = False,  max_length = 120,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 content_type = 4 [ null = False,  blank = False,  model = ContentType,  modifier = required,  type = link,  port = role,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/router.proto b/xos/genx/protos/core/router.proto
deleted file mode 100644
index 8e93565..0000000
--- a/xos/genx/protos/core/router.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message Router {
-  required string name = 1 [ db_index = False,  max_length = 32,  modifier = required,  null = False,  blank = False ];
-  required int32 owner = 2 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = routers,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/service.proto b/xos/genx/protos/core/service.proto
deleted file mode 100644
index b20e9b1..0000000
--- a/xos/genx/protos/core/service.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-
-message Service {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/serviceattribute.proto b/xos/genx/protos/core/serviceattribute.proto
deleted file mode 100644
index 097e365..0000000
--- a/xos/genx/protos/core/serviceattribute.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ServiceAttribute {
-  required string name = 1 [ null = False,  max_length = 128,  blank = False,  help_text = "Attribute Name",  modifier = required,  db_index = False ];
-  required string value = 2 [ db_index = False,  help_text = "Attribute Value",  modifier = required,  null = False,  blank = False ];
-  required int32 service = 3 [ null = False,  blank = False,  help_text = "The Service this attribute is associated with",  model = Service,  modifier = required,  type = link,  port = serviceattributes,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/serviceclass.proto b/xos/genx/protos/core/serviceclass.proto
deleted file mode 100644
index 0061c37..0000000
--- a/xos/genx/protos/core/serviceclass.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-message ServiceClass {
-  required string name = 1 [ null = False,  max_length = 32,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string description = 2 [ null = False,  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 commitment = 3 [ db_index = False,  default = 365,  modifier = required,  null = False,  blank = False ];
-  required int32 membershipFee = 4 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-  required int32 membershipFeeMonths = 5 [ db_index = False,  default = 12,  modifier = required,  null = False,  blank = False ];
-  required bool upgradeRequiresApproval = 6 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/servicecontroller.proto b/xos/genx/protos/core/servicecontroller.proto
deleted file mode 100644
index 4070c1e..0000000
--- a/xos/genx/protos/core/servicecontroller.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-
-message ServiceController {
-  required int32 xos = 1 [ null = False,  default = "get_xos()",  blank = False,  help_text = "Pointer to XOS",  model = XOS,  modifier = required,  type = link,  port = loadable_modules,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string base_url = 3 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "Base URL, allows use of relative URLs for resources",  modifier = optional,  db_index = False ];
-  optional string version = 4 [ null = True,  default = "1.0.0",  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Controller",  modifier = optional,  db_index = False ];
-  optional string provides = 5 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of things provided",  modifier = optional,  db_index = False ];
-  optional string requires = 6 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of required Service Controllers",  modifier = optional,  db_index = False ];
-  optional string synchronizer_run = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "synchronizer run command",  modifier = optional,  db_index = False ];
-  optional string synchronizer_config = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "synchronizer config file",  modifier = optional,  db_index = False ];
-  optional string image = 9 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "docker image name",  modifier = optional,  db_index = False ];
-  required bool no_start = 10 [ null = False,  default = False,  blank = True,  help_text = "Do not start the Synchronizer",  modifier = required,  db_index = False ];
-  required bool no_build = 11 [ null = False,  default = False,  blank = True,  help_text = "Do not build the Synchronizer container",  modifier = required,  db_index = False ];
-  required bool no_deploy = 12 [ null = False,  default = False,  blank = True,  help_text = "Do not add synchronizer container to onboarding-docker-compose",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/servicedependency.proto b/xos/genx/protos/core/servicedependency.proto
deleted file mode 100644
index 97c0c89..0000000
--- a/xos/genx/protos/core/servicedependency.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-
-message ServiceDependency {
-  optional string name = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 provider_service = 3 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = provided_tenants,  db_index = True ];
-  optional int32 subscriber_service = 4 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_tenant = 5 [ null = True,  blank = True,  model = Tenant,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_user = 6 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_root = 7 [ null = True,  blank = True,  model = TenantRoot,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_network = 8 [ null = True,  blank = True,  model = Network,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional string service_specific_id = 9 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 10 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string connect_method = 11 [ null = False,  default = "na",  choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/servicemonitoringagentinfo.proto b/xos/genx/protos/core/servicemonitoringagentinfo.proto
deleted file mode 100644
index 9fbe098..0000000
--- a/xos/genx/protos/core/servicemonitoringagentinfo.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ServiceMonitoringAgentInfo {
-  required string name = 1 [ null = False,  max_length = 128,  blank = False,  help_text = "Monitoring Agent Name",  modifier = required,  db_index = False ];
-  optional int32 service = 2 [ null = True,  blank = True,  help_text = "The Service this attribute is associated with",  model = Service,  modifier = optional,  type = link,  port = servicemonitoringagents,  db_index = True ];
-  required string target_uri = 3 [ db_index = False,  help_text = "Monitoring collector URI to be used by agents to publish the data",  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/serviceprivilege.proto b/xos/genx/protos/core/serviceprivilege.proto
deleted file mode 100644
index 08dba9c..0000000
--- a/xos/genx/protos/core/serviceprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message ServicePrivilege {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = serviceprivileges,  db_index = True ];
-  required int32 service = 2 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = serviceprivileges,  db_index = True ];
-  required int32 role = 3 [ null = False,  blank = False,  model = ServiceRole,  modifier = required,  type = link,  port = serviceprivileges,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/serviceresource.proto b/xos/genx/protos/core/serviceresource.proto
deleted file mode 100644
index bf72a56..0000000
--- a/xos/genx/protos/core/serviceresource.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-
-message ServiceResource {
-  required int32 serviceClass = 1 [ null = False,  blank = False,  model = ServiceClass,  modifier = required,  type = link,  port = serviceresources,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 32,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 maxUnitsDeployment = 3 [ db_index = False,  default = 1,  modifier = required,  null = False,  blank = False ];
-  required int32 maxUnitsNode = 4 [ db_index = False,  default = 1,  modifier = required,  null = False,  blank = False ];
-  required int32 maxDuration = 5 [ db_index = False,  default = 1,  modifier = required,  null = False,  blank = False ];
-  required int32 bucketInRate = 6 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-  required int32 bucketMaxSize = 7 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-  required int32 cost = 8 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-  required bool calendarReservable = 9 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/servicerole.proto b/xos/genx/protos/core/servicerole.proto
deleted file mode 100644
index 0ed7c7e..0000000
--- a/xos/genx/protos/core/servicerole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message ServiceRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'),)",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/site.proto b/xos/genx/protos/core/site.proto
deleted file mode 100644
index 7583135..0000000
--- a/xos/genx/protos/core/site.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-
-message Site {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name for this Site",  modifier = required,  db_index = False ];
-  optional string site_url = 2 [ null = True,  max_length = 512,  content_type = "url",  blank = True,  help_text = "Site's Home URL Page",  modifier = optional,  db_index = False ];
-  required bool enabled = 3 [ null = False,  default = True,  blank = True,  help_text = "Status for this Site",  modifier = required,  db_index = False ];
-  required bool hosts_nodes = 4 [ null = False,  default = True,  blank = True,  help_text = "Indicates whether or not the site host nodes",  modifier = required,  db_index = False ];
-  required bool hosts_users = 5 [ null = False,  default = True,  blank = True,  help_text = "Indicates whether or not the site manages user accounts",  modifier = required,  db_index = False ];
-  optional float longitude = 6 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional float latitude = 7 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string login_base = 8 [ null = False,  max_length = 50,  content_type = "stripped",  blank = False,  help_text = "Prefix for Slices associated with this Site",  modifier = required,  db_index = False ];
-  required bool is_public = 9 [ null = False,  default = True,  blank = True,  help_text = "Indicates the visibility of this site to other members",  modifier = required,  db_index = False ];
-  required string abbreviated_name = 10 [ null = False,  max_length = 80,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/sitecredential.proto b/xos/genx/protos/core/sitecredential.proto
deleted file mode 100644
index a23858e..0000000
--- a/xos/genx/protos/core/sitecredential.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message SiteCredential {
-  required int32 site = 1 [ null = False,  blank = False,  help_text = "The User this credential is associated with",  model = Site,  modifier = required,  type = link,  port = sitecredentials,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 128,  blank = False,  help_text = "The credential type, e.g. ec2",  modifier = required,  db_index = True ];
-  required string key_id = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "The backend id of this credential",  modifier = required,  db_index = False ];
-  required string enc_value = 4 [ null = False,  max_length = 1024,  blank = False,  help_text = "The key value of this credential",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/sitedeployment.proto b/xos/genx/protos/core/sitedeployment.proto
deleted file mode 100644
index 8bbdb9c..0000000
--- a/xos/genx/protos/core/sitedeployment.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message SiteDeployment {
-  required int32 site = 1 [ null = False,  blank = False,  model = Site,  modifier = required,  type = link,  port = sitedeployments,  db_index = True ];
-  required int32 deployment = 2 [ null = False,  blank = False,  model = Deployment,  modifier = required,  type = link,  port = sitedeployments,  db_index = True ];
-  optional int32 controller = 3 [ null = True,  blank = True,  model = Controller,  modifier = optional,  type = link,  port = sitedeployments,  db_index = True ];
-  optional string availability_zone = 4 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "OpenStack availability zone",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/siteprivilege.proto b/xos/genx/protos/core/siteprivilege.proto
deleted file mode 100644
index 03fe82f..0000000
--- a/xos/genx/protos/core/siteprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message SitePrivilege {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = siteprivileges,  db_index = True ];
-  required int32 site = 2 [ null = False,  blank = False,  model = Site,  modifier = required,  type = link,  port = siteprivileges,  db_index = True ];
-  required int32 role = 3 [ null = False,  blank = False,  model = SiteRole,  modifier = required,  type = link,  port = siteprivileges,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/siterole.proto b/xos/genx/protos/core/siterole.proto
deleted file mode 100644
index b302d4c..0000000
--- a/xos/genx/protos/core/siterole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message SiteRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'), ('pi', 'PI'), ('tech', 'Tech'), ('billing', 'Billing'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/slicecredential.proto b/xos/genx/protos/core/slicecredential.proto
deleted file mode 100644
index cf3207f..0000000
--- a/xos/genx/protos/core/slicecredential.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message SliceCredential {
-  required int32 slice = 1 [ null = False,  blank = False,  help_text = "The User this credential is associated with",  model = Slice,  modifier = required,  type = link,  port = slicecredentials,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 128,  blank = False,  help_text = "The credential type, e.g. ec2",  modifier = required,  db_index = True ];
-  required string key_id = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "The backend id of this credential",  modifier = required,  db_index = False ];
-  required string enc_value = 4 [ null = False,  max_length = 1024,  blank = False,  help_text = "The key value of this credential",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/sliceprivilege.proto b/xos/genx/protos/core/sliceprivilege.proto
deleted file mode 100644
index 53783e5..0000000
--- a/xos/genx/protos/core/sliceprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message SlicePrivilege {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = sliceprivileges,  db_index = True ];
-  required int32 slice = 2 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = sliceprivileges,  db_index = True ];
-  required int32 role = 3 [ null = False,  blank = False,  model = SliceRole,  modifier = required,  type = link,  port = sliceprivileges,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/slicerole.proto b/xos/genx/protos/core/slicerole.proto
deleted file mode 100644
index a76300c..0000000
--- a/xos/genx/protos/core/slicerole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message SliceRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'), ('default', 'Default'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/slicetag.proto b/xos/genx/protos/core/slicetag.proto
deleted file mode 100644
index cc6efdf..0000000
--- a/xos/genx/protos/core/slicetag.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message SliceTag {
-  required int32 slice = 1 [ null = False,  blank = False,  model = Slice,  modifier = required,  type = link,  port = slicetags,  db_index = True ];
-  required string name = 2 [ null = False,  choices = "(('privatekey', 'Private Key'), ('publickey', 'Public Key'))",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "The name of this tag",  modifier = required,  db_index = False ];
-  required string value = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "The value of this tag",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tag.proto b/xos/genx/protos/core/tag.proto
deleted file mode 100644
index 6b89473..0000000
--- a/xos/genx/protos/core/tag.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-message Tag {
-  required int32 service = 1 [ null = False,  blank = False,  help_text = "The Service this Tag is associated with",  model = Service,  modifier = required,  type = link,  port = tags,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 128,  blank = False,  help_text = "The name of this tag",  modifier = required,  db_index = True ];
-  required string value = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "The value of this tag",  modifier = required,  db_index = False ];
-  required int32 content_type = 4 [ null = False,  blank = False,  model = ContentType,  modifier = required,  type = link,  port = tag,  db_index = True ];
-  required uint32 object_id = 5 [ db_index = False,  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenant.proto b/xos/genx/protos/core/tenant.proto
deleted file mode 100644
index 2c19a73..0000000
--- a/xos/genx/protos/core/tenant.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-
-message Tenant {
-  optional string name = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 provider_service = 3 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = provided_tenants,  db_index = True ];
-  optional int32 subscriber_service = 4 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_tenant = 5 [ null = True,  blank = True,  model = Tenant,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_user = 6 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_root = 7 [ null = True,  blank = True,  model = TenantRoot,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_network = 8 [ null = True,  blank = True,  model = Network,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional string service_specific_id = 9 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 10 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string connect_method = 11 [ null = False,  default = "na",  choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenantattribute.proto b/xos/genx/protos/core/tenantattribute.proto
deleted file mode 100644
index 9487cef..0000000
--- a/xos/genx/protos/core/tenantattribute.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message TenantAttribute {
-  required string name = 1 [ null = False,  max_length = 128,  blank = False,  help_text = "Attribute Name",  modifier = required,  db_index = False ];
-  required string value = 2 [ db_index = False,  help_text = "Attribute Value",  modifier = required,  null = False,  blank = False ];
-  required int32 tenant = 3 [ null = False,  blank = False,  help_text = "The Tenant this attribute is associated with",  model = Tenant,  modifier = required,  type = link,  port = tenantattributes,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenantprivilege.proto b/xos/genx/protos/core/tenantprivilege.proto
deleted file mode 100644
index 5cb62d1..0000000
--- a/xos/genx/protos/core/tenantprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message TenantPrivilege {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = tenantprivileges,  db_index = True ];
-  required int32 tenant = 2 [ null = False,  blank = False,  model = Tenant,  modifier = required,  type = link,  port = tenantprivileges,  db_index = True ];
-  required int32 role = 3 [ null = False,  blank = False,  model = TenantRole,  modifier = required,  type = link,  port = tenantprivileges,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenantrole.proto b/xos/genx/protos/core/tenantrole.proto
deleted file mode 100644
index ddbadd8..0000000
--- a/xos/genx/protos/core/tenantrole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message TenantRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'), ('access', 'Access'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenantroot.proto b/xos/genx/protos/core/tenantroot.proto
deleted file mode 100644
index eb36bee..0000000
--- a/xos/genx/protos/core/tenantroot.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message TenantRoot {
-  required string kind = 1 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string name = 2 [ null = True,  max_length = 255,  content_type = "stripped",  blank = True,  help_text = "name",  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 3 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string service_specific_id = 4 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenantrootprivilege.proto b/xos/genx/protos/core/tenantrootprivilege.proto
deleted file mode 100644
index f226ead..0000000
--- a/xos/genx/protos/core/tenantrootprivilege.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message TenantRootPrivilege {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = tenant_root_privileges,  db_index = True ];
-  required int32 tenant_root = 2 [ null = False,  blank = False,  model = TenantRoot,  modifier = required,  type = link,  port = tenant_root_privileges,  db_index = True ];
-  required int32 role = 3 [ null = False,  blank = False,  model = TenantRootRole,  modifier = required,  type = link,  port = tenant_root_privileges,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/tenantrootrole.proto b/xos/genx/protos/core/tenantrootrole.proto
deleted file mode 100644
index eee9755..0000000
--- a/xos/genx/protos/core/tenantrootrole.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message TenantRootRole {
-  required string role = 1 [ null = False,  choices = "(('admin', 'Admin'), ('access', 'Access'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/usableobject.proto b/xos/genx/protos/core/usableobject.proto
deleted file mode 100644
index 8cde567..0000000
--- a/xos/genx/protos/core/usableobject.proto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message UsableObject {
-  required string name = 1 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/user.proto b/xos/genx/protos/core/user.proto
deleted file mode 100644
index 201751b..0000000
--- a/xos/genx/protos/core/user.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-message User {
-  required string password = 1 [ db_index = False,  max_length = 128,  modifier = required,  null = False,  blank = False ];
-  optional string last_login = 2 [ db_index = False,  modifier = optional,  null = True,  content_type = "date",  blank = True ];
-  required string email = 3 [ db_index = True,  max_length = 255,  modifier = required,  null = False,  blank = False ];
-  required string username = 4 [ null = False,  default = "Something",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string firstname = 5 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "person's given name",  modifier = required,  db_index = False ];
-  required string lastname = 6 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "person's surname",  modifier = required,  db_index = False ];
-  optional string phone = 7 [ null = True,  max_length = 100,  content_type = "stripped",  blank = True,  help_text = "phone number contact",  modifier = optional,  db_index = False ];
-  optional string user_url = 8 [ null = True,  max_length = 200,  content_type = "url",  blank = True,  modifier = optional,  db_index = False ];
-  required int32 site = 9 [ null = False,  blank = False,  help_text = "Site this user will be homed too",  model = Site,  modifier = required,  type = link,  port = users,  db_index = True ];
-  optional string public_key = 10 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  required bool is_active = 11 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required bool is_admin = 12 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  required bool is_staff = 13 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required bool is_readonly = 14 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  required bool is_registering = 15 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  required bool is_appuser = 16 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  optional string login_page = 17 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "send this user to a specific page on login",  modifier = optional,  db_index = False ];
-  required string timezone = 18 [ null = False,  default = "America/New_York",  choices = "[('Pacific/Midway', '(GMT-1100) Pacific/Midway'), ('Pacific/Niue', '(GMT-1100) Pacific/Niue'), ('Pacific/Pago_Pago', '(GMT-1100) Pacific/Pago_Pago'), ('Pacific/Honolulu', '(GMT-1000) Pacific/Honolulu'), ('Pacific/Johnston', '(GMT-1000) Pacific/Johnston'), ('Pacific/Rarotonga', '(GMT-1000) Pacific/Rarotonga'), ('Pacific/Tahiti', '(GMT-1000) Pacific/Tahiti'), ('US/Hawaii', '(GMT-1000) US/Hawaii'), ('Pacific/Marquesas', '(GMT-0930) Pacific/Marquesas'), ('America/Adak', '(GMT-0900) America/Adak'), ('Pacific/Gambier', '(GMT-0900) Pacific/Gambier'), ('America/Anchorage', '(GMT-0800) America/Anchorage'), ('America/Juneau', '(GMT-0800) America/Juneau'), ('America/Metlakatla', '(GMT-0800) America/Metlakatla'), ('America/Nome', '(GMT-0800) America/Nome'), ('America/Sitka', '(GMT-0800) America/Sitka'), ('America/Yakutat', '(GMT-0800) America/Yakutat'), ('Pacific/Pitcairn', '(GMT-0800) Pacific/Pitcairn'), ('US/Alaska', '(GMT-0800) US/Alaska'), ('America/Chihuahua', '(GMT-0700) America/Chihuahua'), ('America/Creston', '(GMT-0700) America/Creston'), ('America/Dawson', '(GMT-0700) America/Dawson'), ('America/Dawson_Creek', '(GMT-0700) America/Dawson_Creek'), ('America/Fort_Nelson', '(GMT-0700) America/Fort_Nelson'), ('America/Hermosillo', '(GMT-0700) America/Hermosillo'), ('America/Los_Angeles', '(GMT-0700) America/Los_Angeles'), ('America/Mazatlan', '(GMT-0700) America/Mazatlan'), ('America/Phoenix', '(GMT-0700) America/Phoenix'), ('America/Tijuana', '(GMT-0700) America/Tijuana'), ('America/Vancouver', '(GMT-0700) America/Vancouver'), ('America/Whitehorse', '(GMT-0700) America/Whitehorse'), ('Canada/Pacific', '(GMT-0700) Canada/Pacific'), ('US/Arizona', '(GMT-0700) US/Arizona'), ('US/Pacific', '(GMT-0700) US/Pacific'), ('America/Bahia_Banderas', '(GMT-0600) America/Bahia_Banderas'), ('America/Belize', '(GMT-0600) America/Belize'), ('America/Boise', '(GMT-0600) America/Boise'), ('America/Cambridge_Bay', '(GMT-0600) America/Cambridge_Bay'), ('America/Costa_Rica', '(GMT-0600) America/Costa_Rica'), ('America/Denver', '(GMT-0600) America/Denver'), ('America/Edmonton', '(GMT-0600) America/Edmonton'), ('America/El_Salvador', '(GMT-0600) America/El_Salvador'), ('America/Guatemala', '(GMT-0600) America/Guatemala'), ('America/Inuvik', '(GMT-0600) America/Inuvik'), ('America/Managua', '(GMT-0600) America/Managua'), ('America/Merida', '(GMT-0600) America/Merida'), ('America/Mexico_City', '(GMT-0600) America/Mexico_City'), ('America/Monterrey', '(GMT-0600) America/Monterrey'), ('America/Ojinaga', '(GMT-0600) America/Ojinaga'), ('America/Regina', '(GMT-0600) America/Regina'), ('America/Swift_Current', '(GMT-0600) America/Swift_Current'), ('America/Tegucigalpa', '(GMT-0600) America/Tegucigalpa'), ('America/Yellowknife', '(GMT-0600) America/Yellowknife'), ('Canada/Mountain', '(GMT-0600) Canada/Mountain'), ('Pacific/Galapagos', '(GMT-0600) Pacific/Galapagos'), ('US/Mountain', '(GMT-0600) US/Mountain'), ('America/Atikokan', '(GMT-0500) America/Atikokan'), ('America/Bogota', '(GMT-0500) America/Bogota'), ('America/Cancun', '(GMT-0500) America/Cancun'), ('America/Cayman', '(GMT-0500) America/Cayman'), ('America/Chicago', '(GMT-0500) America/Chicago'), ('America/Eirunepe', '(GMT-0500) America/Eirunepe'), ('America/Guayaquil', '(GMT-0500) America/Guayaquil'), ('America/Indiana/Knox', '(GMT-0500) America/Indiana/Knox'), ('America/Indiana/Tell_City', '(GMT-0500) America/Indiana/Tell_City'), ('America/Jamaica', '(GMT-0500) America/Jamaica'), ('America/Lima', '(GMT-0500) America/Lima'), ('America/Matamoros', '(GMT-0500) America/Matamoros'), ('America/Menominee', '(GMT-0500) America/Menominee'), ('America/North_Dakota/Beulah', '(GMT-0500) America/North_Dakota/Beulah'), ('America/North_Dakota/Center', '(GMT-0500) America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', '(GMT-0500) America/North_Dakota/New_Salem'), ('America/Panama', '(GMT-0500) America/Panama'), ('America/Port-au-Prince', '(GMT-0500) America/Port-au-Prince'), ('America/Rainy_River', '(GMT-0500) America/Rainy_River'), ('America/Rankin_Inlet', '(GMT-0500) America/Rankin_Inlet'), ('America/Resolute', '(GMT-0500) America/Resolute'), ('America/Rio_Branco', '(GMT-0500) America/Rio_Branco'), ('America/Winnipeg', '(GMT-0500) America/Winnipeg'), ('Canada/Central', '(GMT-0500) Canada/Central'), ('Pacific/Easter', '(GMT-0500) Pacific/Easter'), ('US/Central', '(GMT-0500) US/Central'), ('America/Anguilla', '(GMT-0400) America/Anguilla'), ('America/Antigua', '(GMT-0400) America/Antigua'), ('America/Aruba', '(GMT-0400) America/Aruba'), ('America/Asuncion', '(GMT-0400) America/Asuncion'), ('America/Barbados', '(GMT-0400) America/Barbados'), ('America/Blanc-Sablon', '(GMT-0400) America/Blanc-Sablon'), ('America/Boa_Vista', '(GMT-0400) America/Boa_Vista'), ('America/Campo_Grande', '(GMT-0400) America/Campo_Grande'), ('America/Caracas', '(GMT-0400) America/Caracas'), ('America/Cuiaba', '(GMT-0400) America/Cuiaba'), ('America/Curacao', '(GMT-0400) America/Curacao'), ('America/Detroit', '(GMT-0400) America/Detroit'), ('America/Dominica', '(GMT-0400) America/Dominica'), ('America/Grand_Turk', '(GMT-0400) America/Grand_Turk'), ('America/Grenada', '(GMT-0400) America/Grenada'), ('America/Guadeloupe', '(GMT-0400) America/Guadeloupe'), ('America/Guyana', '(GMT-0400) America/Guyana'), ('America/Havana', '(GMT-0400) America/Havana'), ('America/Indiana/Indianapolis', '(GMT-0400) America/Indiana/Indianapolis'), ('America/Indiana/Marengo', '(GMT-0400) America/Indiana/Marengo'), ('America/Indiana/Petersburg', '(GMT-0400) America/Indiana/Petersburg'), ('America/Indiana/Vevay', '(GMT-0400) America/Indiana/Vevay'), ('America/Indiana/Vincennes', '(GMT-0400) America/Indiana/Vincennes'), ('America/Indiana/Winamac', '(GMT-0400) America/Indiana/Winamac'), ('America/Iqaluit', '(GMT-0400) America/Iqaluit'), ('America/Kentucky/Louisville', '(GMT-0400) America/Kentucky/Louisville'), ('America/Kentucky/Monticello', '(GMT-0400) America/Kentucky/Monticello'), ('America/Kralendijk', '(GMT-0400) America/Kralendijk'), ('America/La_Paz', '(GMT-0400) America/La_Paz'), ('America/Lower_Princes', '(GMT-0400) America/Lower_Princes'), ('America/Manaus', '(GMT-0400) America/Manaus'), ('America/Marigot', '(GMT-0400) America/Marigot'), ('America/Martinique', '(GMT-0400) America/Martinique'), ('America/Montserrat', '(GMT-0400) America/Montserrat'), ('America/Nassau', '(GMT-0400) America/Nassau'), ('America/New_York', '(GMT-0400) America/New_York'), ('America/Nipigon', '(GMT-0400) America/Nipigon'), ('America/Pangnirtung', '(GMT-0400) America/Pangnirtung'), ('America/Port_of_Spain', '(GMT-0400) America/Port_of_Spain'), ('America/Porto_Velho', '(GMT-0400) America/Porto_Velho'), ('America/Puerto_Rico', '(GMT-0400) America/Puerto_Rico'), ('America/Santo_Domingo', '(GMT-0400) America/Santo_Domingo'), ('America/St_Barthelemy', '(GMT-0400) America/St_Barthelemy'), ('America/St_Kitts', '(GMT-0400) America/St_Kitts'), ('America/St_Lucia', '(GMT-0400) America/St_Lucia'), ('America/St_Thomas', '(GMT-0400) America/St_Thomas'), ('America/St_Vincent', '(GMT-0400) America/St_Vincent'), ('America/Thunder_Bay', '(GMT-0400) America/Thunder_Bay'), ('America/Toronto', '(GMT-0400) America/Toronto'), ('America/Tortola', '(GMT-0400) America/Tortola'), ('Canada/Eastern', '(GMT-0400) Canada/Eastern'), ('US/Eastern', '(GMT-0400) US/Eastern'), ('America/Araguaina', '(GMT-0300) America/Araguaina'), ('America/Argentina/Buenos_Aires', '(GMT-0300) America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', '(GMT-0300) America/Argentina/Catamarca'), ('America/Argentina/Cordoba', '(GMT-0300) America/Argentina/Cordoba'), ('America/Argentina/Jujuy', '(GMT-0300) America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', '(GMT-0300) America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', '(GMT-0300) America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', '(GMT-0300) America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', '(GMT-0300) America/Argentina/Salta'), ('America/Argentina/San_Juan', '(GMT-0300) America/Argentina/San_Juan'), ('America/Argentina/San_Luis', '(GMT-0300) America/Argentina/San_Luis'), ('America/Argentina/Tucuman', '(GMT-0300) America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', '(GMT-0300) America/Argentina/Ushuaia'), ('America/Bahia', '(GMT-0300) America/Bahia'), ('America/Belem', '(GMT-0300) America/Belem'), ('America/Cayenne', '(GMT-0300) America/Cayenne'), ('America/Fortaleza', '(GMT-0300) America/Fortaleza'), ('America/Glace_Bay', '(GMT-0300) America/Glace_Bay'), ('America/Goose_Bay', '(GMT-0300) America/Goose_Bay'), ('America/Halifax', '(GMT-0300) America/Halifax'), ('America/Maceio', '(GMT-0300) America/Maceio'), ('America/Moncton', '(GMT-0300) America/Moncton'), ('America/Montevideo', '(GMT-0300) America/Montevideo'), ('America/Paramaribo', '(GMT-0300) America/Paramaribo'), ('America/Recife', '(GMT-0300) America/Recife'), ('America/Santarem', '(GMT-0300) America/Santarem'), ('America/Santiago', '(GMT-0300) America/Santiago'), ('America/Sao_Paulo', '(GMT-0300) America/Sao_Paulo'), ('America/Thule', '(GMT-0300) America/Thule'), ('Antarctica/Palmer', '(GMT-0300) Antarctica/Palmer'), ('Antarctica/Rothera', '(GMT-0300) Antarctica/Rothera'), ('Atlantic/Bermuda', '(GMT-0300) Atlantic/Bermuda'), ('Atlantic/Stanley', '(GMT-0300) Atlantic/Stanley'), ('Canada/Atlantic', '(GMT-0300) Canada/Atlantic'), ('America/St_Johns', '(GMT-0230) America/St_Johns'), ('Canada/Newfoundland', '(GMT-0230) Canada/Newfoundland'), ('America/Godthab', '(GMT-0200) America/Godthab'), ('America/Miquelon', '(GMT-0200) America/Miquelon'), ('America/Noronha', '(GMT-0200) America/Noronha'), ('Atlantic/South_Georgia', '(GMT-0200) Atlantic/South_Georgia'), ('Atlantic/Cape_Verde', '(GMT-0100) Atlantic/Cape_Verde'), ('Africa/Abidjan', '(GMT+0000) Africa/Abidjan'), ('Africa/Accra', '(GMT+0000) Africa/Accra'), ('Africa/Bamako', '(GMT+0000) Africa/Bamako'), ('Africa/Banjul', '(GMT+0000) Africa/Banjul'), ('Africa/Bissau', '(GMT+0000) Africa/Bissau'), ('Africa/Conakry', '(GMT+0000) Africa/Conakry'), ('Africa/Dakar', '(GMT+0000) Africa/Dakar'), ('Africa/Freetown', '(GMT+0000) Africa/Freetown'), ('Africa/Lome', '(GMT+0000) Africa/Lome'), ('Africa/Monrovia', '(GMT+0000) Africa/Monrovia'), ('Africa/Nouakchott', '(GMT+0000) Africa/Nouakchott'), ('Africa/Ouagadougou', '(GMT+0000) Africa/Ouagadougou'), ('Africa/Sao_Tome', '(GMT+0000) Africa/Sao_Tome'), ('America/Danmarkshavn', '(GMT+0000) America/Danmarkshavn'), ('America/Scoresbysund', '(GMT+0000) America/Scoresbysund'), ('Atlantic/Azores', '(GMT+0000) Atlantic/Azores'), ('Atlantic/Reykjavik', '(GMT+0000) Atlantic/Reykjavik'), ('Atlantic/St_Helena', '(GMT+0000) Atlantic/St_Helena'), ('GMT', '(GMT+0000) GMT'), ('UTC', '(GMT+0000) UTC'), ('Africa/Algiers', '(GMT+0100) Africa/Algiers'), ('Africa/Bangui', '(GMT+0100) Africa/Bangui'), ('Africa/Brazzaville', '(GMT+0100) Africa/Brazzaville'), ('Africa/Casablanca', '(GMT+0100) Africa/Casablanca'), ('Africa/Douala', '(GMT+0100) Africa/Douala'), ('Africa/El_Aaiun', '(GMT+0100) Africa/El_Aaiun'), ('Africa/Kinshasa', '(GMT+0100) Africa/Kinshasa'), ('Africa/Lagos', '(GMT+0100) Africa/Lagos'), ('Africa/Libreville', '(GMT+0100) Africa/Libreville'), ('Africa/Luanda', '(GMT+0100) Africa/Luanda'), ('Africa/Malabo', '(GMT+0100) Africa/Malabo'), ('Africa/Ndjamena', '(GMT+0100) Africa/Ndjamena'), ('Africa/Niamey', '(GMT+0100) Africa/Niamey'), ('Africa/Porto-Novo', '(GMT+0100) Africa/Porto-Novo'), ('Africa/Tunis', '(GMT+0100) Africa/Tunis'), ('Atlantic/Canary', '(GMT+0100) Atlantic/Canary'), ('Atlantic/Faroe', '(GMT+0100) Atlantic/Faroe'), ('Atlantic/Madeira', '(GMT+0100) Atlantic/Madeira'), ('Europe/Dublin', '(GMT+0100) Europe/Dublin'), ('Europe/Guernsey', '(GMT+0100) Europe/Guernsey'), ('Europe/Isle_of_Man', '(GMT+0100) Europe/Isle_of_Man'), ('Europe/Jersey', '(GMT+0100) Europe/Jersey'), ('Europe/Lisbon', '(GMT+0100) Europe/Lisbon'), ('Europe/London', '(GMT+0100) Europe/London'), ('Africa/Blantyre', '(GMT+0200) Africa/Blantyre'), ('Africa/Bujumbura', '(GMT+0200) Africa/Bujumbura'), ('Africa/Cairo', '(GMT+0200) Africa/Cairo'), ('Africa/Ceuta', '(GMT+0200) Africa/Ceuta'), ('Africa/Gaborone', '(GMT+0200) Africa/Gaborone'), ('Africa/Harare', '(GMT+0200) Africa/Harare'), ('Africa/Johannesburg', '(GMT+0200) Africa/Johannesburg'), ('Africa/Kigali', '(GMT+0200) Africa/Kigali'), ('Africa/Lubumbashi', '(GMT+0200) Africa/Lubumbashi'), ('Africa/Lusaka', '(GMT+0200) Africa/Lusaka'), ('Africa/Maputo', '(GMT+0200) Africa/Maputo'), ('Africa/Maseru', '(GMT+0200) Africa/Maseru'), ('Africa/Mbabane', '(GMT+0200) Africa/Mbabane'), ('Africa/Tripoli', '(GMT+0200) Africa/Tripoli'), ('Africa/Windhoek', '(GMT+0200) Africa/Windhoek'), ('Antarctica/Troll', '(GMT+0200) Antarctica/Troll'), ('Arctic/Longyearbyen', '(GMT+0200) Arctic/Longyearbyen'), ('Asia/Amman', '(GMT+0200) Asia/Amman'), ('Asia/Damascus', '(GMT+0200) Asia/Damascus'), ('Europe/Amsterdam', '(GMT+0200) Europe/Amsterdam'), ('Europe/Andorra', '(GMT+0200) Europe/Andorra'), ('Europe/Belgrade', '(GMT+0200) Europe/Belgrade'), ('Europe/Berlin', '(GMT+0200) Europe/Berlin'), ('Europe/Bratislava', '(GMT+0200) Europe/Bratislava'), ('Europe/Brussels', '(GMT+0200) Europe/Brussels'), ('Europe/Budapest', '(GMT+0200) Europe/Budapest'), ('Europe/Busingen', '(GMT+0200) Europe/Busingen'), ('Europe/Copenhagen', '(GMT+0200) Europe/Copenhagen'), ('Europe/Gibraltar', '(GMT+0200) Europe/Gibraltar'), ('Europe/Kaliningrad', '(GMT+0200) Europe/Kaliningrad'), ('Europe/Ljubljana', '(GMT+0200) Europe/Ljubljana'), ('Europe/Luxembourg', '(GMT+0200) Europe/Luxembourg'), ('Europe/Madrid', '(GMT+0200) Europe/Madrid'), ('Europe/Malta', '(GMT+0200) Europe/Malta'), ('Europe/Monaco', '(GMT+0200) Europe/Monaco'), ('Europe/Oslo', '(GMT+0200) Europe/Oslo'), ('Europe/Paris', '(GMT+0200) Europe/Paris'), ('Europe/Podgorica', '(GMT+0200) Europe/Podgorica'), ('Europe/Prague', '(GMT+0200) Europe/Prague'), ('Europe/Rome', '(GMT+0200) Europe/Rome'), ('Europe/San_Marino', '(GMT+0200) Europe/San_Marino'), ('Europe/Sarajevo', '(GMT+0200) Europe/Sarajevo'), ('Europe/Skopje', '(GMT+0200) Europe/Skopje'), ('Europe/Stockholm', '(GMT+0200) Europe/Stockholm'), ('Europe/Tirane', '(GMT+0200) Europe/Tirane'), ('Europe/Vaduz', '(GMT+0200) Europe/Vaduz'), ('Europe/Vatican', '(GMT+0200) Europe/Vatican'), ('Europe/Vienna', '(GMT+0200) Europe/Vienna'), ('Europe/Warsaw', '(GMT+0200) Europe/Warsaw'), ('Europe/Zagreb', '(GMT+0200) Europe/Zagreb'), ('Europe/Zurich', '(GMT+0200) Europe/Zurich'), ('Africa/Addis_Ababa', '(GMT+0300) Africa/Addis_Ababa'), ('Africa/Asmara', '(GMT+0300) Africa/Asmara'), ('Africa/Dar_es_Salaam', '(GMT+0300) Africa/Dar_es_Salaam'), ('Africa/Djibouti', '(GMT+0300) Africa/Djibouti'), ('Africa/Juba', '(GMT+0300) Africa/Juba'), ('Africa/Kampala', '(GMT+0300) Africa/Kampala'), ('Africa/Khartoum', '(GMT+0300) Africa/Khartoum'), ('Africa/Mogadishu', '(GMT+0300) Africa/Mogadishu'), ('Africa/Nairobi', '(GMT+0300) Africa/Nairobi'), ('Antarctica/Syowa', '(GMT+0300) Antarctica/Syowa'), ('Asia/Aden', '(GMT+0300) Asia/Aden'), ('Asia/Baghdad', '(GMT+0300) Asia/Baghdad'), ('Asia/Bahrain', '(GMT+0300) Asia/Bahrain'), ('Asia/Beirut', '(GMT+0300) Asia/Beirut'), ('Asia/Gaza', '(GMT+0300) Asia/Gaza'), ('Asia/Hebron', '(GMT+0300) Asia/Hebron'), ('Asia/Jerusalem', '(GMT+0300) Asia/Jerusalem'), ('Asia/Kuwait', '(GMT+0300) Asia/Kuwait'), ('Asia/Nicosia', '(GMT+0300) Asia/Nicosia'), ('Asia/Qatar', '(GMT+0300) Asia/Qatar'), ('Asia/Riyadh', '(GMT+0300) Asia/Riyadh'), ('Europe/Athens', '(GMT+0300) Europe/Athens'), ('Europe/Bucharest', '(GMT+0300) Europe/Bucharest'), ('Europe/Chisinau', '(GMT+0300) Europe/Chisinau'), ('Europe/Helsinki', '(GMT+0300) Europe/Helsinki'), ('Europe/Istanbul', '(GMT+0300) Europe/Istanbul'), ('Europe/Kiev', '(GMT+0300) Europe/Kiev'), ('Europe/Kirov', '(GMT+0300) Europe/Kirov'), ('Europe/Mariehamn', '(GMT+0300) Europe/Mariehamn'), ('Europe/Minsk', '(GMT+0300) Europe/Minsk'), ('Europe/Moscow', '(GMT+0300) Europe/Moscow'), ('Europe/Riga', '(GMT+0300) Europe/Riga'), ('Europe/Simferopol', '(GMT+0300) Europe/Simferopol'), ('Europe/Sofia', '(GMT+0300) Europe/Sofia'), ('Europe/Tallinn', '(GMT+0300) Europe/Tallinn'), ('Europe/Uzhgorod', '(GMT+0300) Europe/Uzhgorod'), ('Europe/Vilnius', '(GMT+0300) Europe/Vilnius'), ('Europe/Volgograd', '(GMT+0300) Europe/Volgograd'), ('Europe/Zaporozhye', '(GMT+0300) Europe/Zaporozhye'), ('Indian/Antananarivo', '(GMT+0300) Indian/Antananarivo'), ('Indian/Comoro', '(GMT+0300) Indian/Comoro'), ('Indian/Mayotte', '(GMT+0300) Indian/Mayotte'), ('Asia/Baku', '(GMT+0400) Asia/Baku'), ('Asia/Dubai', '(GMT+0400) Asia/Dubai'), ('Asia/Muscat', '(GMT+0400) Asia/Muscat'), ('Asia/Tbilisi', '(GMT+0400) Asia/Tbilisi'), ('Asia/Yerevan', '(GMT+0400) Asia/Yerevan'), ('Europe/Astrakhan', '(GMT+0400) Europe/Astrakhan'), ('Europe/Samara', '(GMT+0400) Europe/Samara'), ('Europe/Ulyanovsk', '(GMT+0400) Europe/Ulyanovsk'), ('Indian/Mahe', '(GMT+0400) Indian/Mahe'), ('Indian/Mauritius', '(GMT+0400) Indian/Mauritius'), ('Indian/Reunion', '(GMT+0400) Indian/Reunion'), ('Asia/Kabul', '(GMT+0430) Asia/Kabul'), ('Asia/Tehran', '(GMT+0430) Asia/Tehran'), ('Antarctica/Mawson', '(GMT+0500) Antarctica/Mawson'), ('Asia/Aqtau', '(GMT+0500) Asia/Aqtau'), ('Asia/Aqtobe', '(GMT+0500) Asia/Aqtobe'), ('Asia/Ashgabat', '(GMT+0500) Asia/Ashgabat'), ('Asia/Dushanbe', '(GMT+0500) Asia/Dushanbe'), ('Asia/Karachi', '(GMT+0500) Asia/Karachi'), ('Asia/Oral', '(GMT+0500) Asia/Oral'), ('Asia/Samarkand', '(GMT+0500) Asia/Samarkand'), ('Asia/Tashkent', '(GMT+0500) Asia/Tashkent'), ('Asia/Yekaterinburg', '(GMT+0500) Asia/Yekaterinburg'), ('Indian/Kerguelen', '(GMT+0500) Indian/Kerguelen'), ('Indian/Maldives', '(GMT+0500) Indian/Maldives'), ('Asia/Colombo', '(GMT+0530) Asia/Colombo'), ('Asia/Kolkata', '(GMT+0530) Asia/Kolkata'), ('Asia/Kathmandu', '(GMT+0545) Asia/Kathmandu'), ('Antarctica/Vostok', '(GMT+0600) Antarctica/Vostok'), ('Asia/Almaty', '(GMT+0600) Asia/Almaty'), ('Asia/Bishkek', '(GMT+0600) Asia/Bishkek'), ('Asia/Dhaka', '(GMT+0600) Asia/Dhaka'), ('Asia/Omsk', '(GMT+0600) Asia/Omsk'), ('Asia/Qyzylorda', '(GMT+0600) Asia/Qyzylorda'), ('Asia/Thimphu', '(GMT+0600) Asia/Thimphu'), ('Asia/Urumqi', '(GMT+0600) Asia/Urumqi'), ('Indian/Chagos', '(GMT+0600) Indian/Chagos'), ('Asia/Rangoon', '(GMT+0630) Asia/Rangoon'), ('Indian/Cocos', '(GMT+0630) Indian/Cocos'), ('Antarctica/Davis', '(GMT+0700) Antarctica/Davis'), ('Asia/Bangkok', '(GMT+0700) Asia/Bangkok'), ('Asia/Barnaul', '(GMT+0700) Asia/Barnaul'), ('Asia/Ho_Chi_Minh', '(GMT+0700) Asia/Ho_Chi_Minh'), ('Asia/Jakarta', '(GMT+0700) Asia/Jakarta'), ('Asia/Krasnoyarsk', '(GMT+0700) Asia/Krasnoyarsk'), ('Asia/Novokuznetsk', '(GMT+0700) Asia/Novokuznetsk'), ('Asia/Novosibirsk', '(GMT+0700) Asia/Novosibirsk'), ('Asia/Phnom_Penh', '(GMT+0700) Asia/Phnom_Penh'), ('Asia/Pontianak', '(GMT+0700) Asia/Pontianak'), ('Asia/Tomsk', '(GMT+0700) Asia/Tomsk'), ('Asia/Vientiane', '(GMT+0700) Asia/Vientiane'), ('Indian/Christmas', '(GMT+0700) Indian/Christmas'), ('Antarctica/Casey', '(GMT+0800) Antarctica/Casey'), ('Asia/Brunei', '(GMT+0800) Asia/Brunei'), ('Asia/Hong_Kong', '(GMT+0800) Asia/Hong_Kong'), ('Asia/Hovd', '(GMT+0800) Asia/Hovd'), ('Asia/Irkutsk', '(GMT+0800) Asia/Irkutsk'), ('Asia/Kuala_Lumpur', '(GMT+0800) Asia/Kuala_Lumpur'), ('Asia/Kuching', '(GMT+0800) Asia/Kuching'), ('Asia/Macau', '(GMT+0800) Asia/Macau'), ('Asia/Makassar', '(GMT+0800) Asia/Makassar'), ('Asia/Manila', '(GMT+0800) Asia/Manila'), ('Asia/Shanghai', '(GMT+0800) Asia/Shanghai'), ('Asia/Singapore', '(GMT+0800) Asia/Singapore'), ('Asia/Taipei', '(GMT+0800) Asia/Taipei'), ('Australia/Perth', '(GMT+0800) Australia/Perth'), ('Asia/Pyongyang', '(GMT+0830) Asia/Pyongyang'), ('Australia/Eucla', '(GMT+0845) Australia/Eucla'), ('Asia/Chita', '(GMT+0900) Asia/Chita'), ('Asia/Choibalsan', '(GMT+0900) Asia/Choibalsan'), ('Asia/Dili', '(GMT+0900) Asia/Dili'), ('Asia/Jayapura', '(GMT+0900) Asia/Jayapura'), ('Asia/Khandyga', '(GMT+0900) Asia/Khandyga'), ('Asia/Seoul', '(GMT+0900) Asia/Seoul'), ('Asia/Tokyo', '(GMT+0900) Asia/Tokyo'), ('Asia/Ulaanbaatar', '(GMT+0900) Asia/Ulaanbaatar'), ('Asia/Yakutsk', '(GMT+0900) Asia/Yakutsk'), ('Pacific/Palau', '(GMT+0900) Pacific/Palau'), ('Australia/Darwin', '(GMT+0930) Australia/Darwin'), ('Antarctica/DumontDUrville', '(GMT+1000) Antarctica/DumontDUrville'), ('Asia/Ust-Nera', '(GMT+1000) Asia/Ust-Nera'), ('Asia/Vladivostok', '(GMT+1000) Asia/Vladivostok'), ('Australia/Brisbane', '(GMT+1000) Australia/Brisbane'), ('Australia/Lindeman', '(GMT+1000) Australia/Lindeman'), ('Pacific/Chuuk', '(GMT+1000) Pacific/Chuuk'), ('Pacific/Guam', '(GMT+1000) Pacific/Guam'), ('Pacific/Port_Moresby', '(GMT+1000) Pacific/Port_Moresby'), ('Pacific/Saipan', '(GMT+1000) Pacific/Saipan'), ('Australia/Adelaide', '(GMT+1030) Australia/Adelaide'), ('Australia/Broken_Hill', '(GMT+1030) Australia/Broken_Hill'), ('Antarctica/Macquarie', '(GMT+1100) Antarctica/Macquarie'), ('Asia/Magadan', '(GMT+1100) Asia/Magadan'), ('Asia/Sakhalin', '(GMT+1100) Asia/Sakhalin'), ('Asia/Srednekolymsk', '(GMT+1100) Asia/Srednekolymsk'), ('Australia/Currie', '(GMT+1100) Australia/Currie'), ('Australia/Hobart', '(GMT+1100) Australia/Hobart'), ('Australia/Lord_Howe', '(GMT+1100) Australia/Lord_Howe'), ('Australia/Melbourne', '(GMT+1100) Australia/Melbourne'), ('Australia/Sydney', '(GMT+1100) Australia/Sydney'), ('Pacific/Bougainville', '(GMT+1100) Pacific/Bougainville'), ('Pacific/Efate', '(GMT+1100) Pacific/Efate'), ('Pacific/Guadalcanal', '(GMT+1100) Pacific/Guadalcanal'), ('Pacific/Kosrae', '(GMT+1100) Pacific/Kosrae'), ('Pacific/Norfolk', '(GMT+1100) Pacific/Norfolk'), ('Pacific/Noumea', '(GMT+1100) Pacific/Noumea'), ('Pacific/Pohnpei', '(GMT+1100) Pacific/Pohnpei'), ('Asia/Anadyr', '(GMT+1200) Asia/Anadyr'), ('Asia/Kamchatka', '(GMT+1200) Asia/Kamchatka'), ('Pacific/Fiji', '(GMT+1200) Pacific/Fiji'), ('Pacific/Funafuti', '(GMT+1200) Pacific/Funafuti'), ('Pacific/Kwajalein', '(GMT+1200) Pacific/Kwajalein'), ('Pacific/Majuro', '(GMT+1200) Pacific/Majuro'), ('Pacific/Nauru', '(GMT+1200) Pacific/Nauru'), ('Pacific/Tarawa', '(GMT+1200) Pacific/Tarawa'), ('Pacific/Wake', '(GMT+1200) Pacific/Wake'), ('Pacific/Wallis', '(GMT+1200) Pacific/Wallis'), ('Antarctica/McMurdo', '(GMT+1300) Antarctica/McMurdo'), ('Pacific/Auckland', '(GMT+1300) Pacific/Auckland'), ('Pacific/Enderbury', '(GMT+1300) Pacific/Enderbury'), ('Pacific/Fakaofo', '(GMT+1300) Pacific/Fakaofo'), ('Pacific/Tongatapu', '(GMT+1300) Pacific/Tongatapu'), ('Pacific/Chatham', '(GMT+1345) Pacific/Chatham'), ('Pacific/Apia', '(GMT+1400) Pacific/Apia'), ('Pacific/Kiritimati', '(GMT+1400) Pacific/Kiritimati')]",  max_length = 100,  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/usercredential.proto b/xos/genx/protos/core/usercredential.proto
deleted file mode 100644
index 5aa414f..0000000
--- a/xos/genx/protos/core/usercredential.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message UserCredential {
-  required int32 user = 1 [ null = False,  blank = False,  help_text = "The User this credential is associated with",  model = User,  modifier = required,  type = link,  port = usercredentials,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 128,  blank = False,  help_text = "The credential type, e.g. ec2",  modifier = required,  db_index = True ];
-  required string key_id = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "The backend id of this credential",  modifier = required,  db_index = False ];
-  required string enc_value = 4 [ null = False,  max_length = 1024,  blank = False,  help_text = "The key value of this credential",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/userdashboardview.proto b/xos/genx/protos/core/userdashboardview.proto
deleted file mode 100644
index ddc8b63..0000000
--- a/xos/genx/protos/core/userdashboardview.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message UserDashboardView {
-  required int32 user = 1 [ null = False,  blank = False,  model = User,  modifier = required,  type = link,  port = userdashboardviews,  db_index = True ];
-  required int32 dashboardView = 2 [ null = False,  blank = False,  model = DashboardView,  modifier = required,  type = link,  port = userdashboardviews,  db_index = True ];
-  required int32 order = 3 [ db_index = False,  default = 0,  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xos.proto b/xos/genx/protos/core/xos.proto
deleted file mode 100644
index 0eda556..0000000
--- a/xos/genx/protos/core/xos.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-
-message XOS {
-  required string name = 1 [ null = False,  default = "XOS",  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of XOS",  modifier = required,  db_index = False ];
-  required int32 ui_port = 2 [ null = False,  default = 80,  blank = False,  help_text = "Port for XOS UI",  modifier = required,  db_index = False ];
-  required int32 bootstrap_ui_port = 3 [ null = False,  default = 81,  blank = False,  help_text = "Port for XOS Bootstrap UI",  modifier = required,  db_index = False ];
-  required string db_container_name = 4 [ null = False,  default = "xos_db",  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "name of XOS db container",  modifier = required,  db_index = False ];
-  required string redis_container_name = 5 [ null = False,  default = "",  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "name of XOS redis container",  modifier = required,  db_index = False ];
-  required string docker_project_name = 6 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "docker project name",  modifier = required,  db_index = False ];
-  required bool enable_build = 7 [ null = False,  default = True,  blank = True,  help_text = "True if Onboarding Synchronizer should build XOS as necessary",  modifier = required,  db_index = False ];
-  required bool frontend_only = 8 [ null = False,  default = False,  blank = True,  help_text = "If True, XOS will not start synchronizer containers",  modifier = required,  db_index = False ];
-  required string source_ui_image = 9 [ null = False,  default = "xosproject/xos",  max_length = 200,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string extra_hosts = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "list of hostname mappings that will be passed to docker-compose",  modifier = optional,  db_index = False ];
-  required bool no_start = 11 [ null = False,  default = False,  blank = True,  help_text = "Do not start the XOS UI inside of the UI docker container",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xoscomponent.proto b/xos/genx/protos/core/xoscomponent.proto
deleted file mode 100644
index 996b282..0000000
--- a/xos/genx/protos/core/xoscomponent.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-
-message XOSComponent {
-  required int32 xos = 1 [ null = False,  default = "get_xos()",  blank = False,  help_text = "Pointer to XOS",  model = XOS,  modifier = required,  type = link,  port = loadable_modules,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string base_url = 3 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "Base URL, allows use of relative URLs for resources",  modifier = optional,  db_index = False ];
-  optional string version = 4 [ null = True,  default = "1.0.0",  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Controller",  modifier = optional,  db_index = False ];
-  optional string provides = 5 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of things provided",  modifier = optional,  db_index = False ];
-  optional string requires = 6 [ null = True,  max_length = 254,  content_type = "stripped",  blank = True,  help_text = "Comma-separated list of required Service Controllers",  modifier = optional,  db_index = False ];
-  required string image = 7 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "docker image name",  modifier = required,  db_index = False ];
-  optional string command = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  help_text = "docker run command",  modifier = optional,  db_index = False ];
-  optional string ports = 9 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "port binding",  modifier = optional,  db_index = False ];
-  optional string extra = 10 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  help_text = "extra information needed by containers",  modifier = optional,  db_index = False ];
-  required bool no_start = 11 [ null = False,  default = False,  blank = True,  help_text = "Do not start the Component",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xoscomponentlink.proto b/xos/genx/protos/core/xoscomponentlink.proto
deleted file mode 100644
index 847df34..0000000
--- a/xos/genx/protos/core/xoscomponentlink.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message XOSComponentLink {
-  required int32 component = 1 [ null = False,  blank = False,  help_text = "The Component object for this Link",  model = XOSComponent,  modifier = required,  type = link,  port = links,  db_index = True ];
-  required string container = 2 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "container to link",  modifier = required,  db_index = False ];
-  required string alias = 3 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "alias for the link",  modifier = required,  db_index = False ];
-  required string kind = 4 [ null = False,  default = "internal",  choices = "(('internal', 'Internal'), ('external', 'External'))",  max_length = 20,  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xoscomponentvolume.proto b/xos/genx/protos/core/xoscomponentvolume.proto
deleted file mode 100644
index d3075e9..0000000
--- a/xos/genx/protos/core/xoscomponentvolume.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-message XOSComponentVolume {
-  required int32 component = 1 [ null = False,  blank = False,  help_text = "The Component object for this Volume",  model = XOSComponent,  modifier = required,  type = link,  port = volumes,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 300,  content_type = "stripped",  blank = False,  help_text = "Volume Name",  modifier = required,  db_index = False ];
-  required string container_path = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "Path of Volume in Container",  modifier = required,  db_index = False ];
-  required string host_path = 4 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "Path of Volume in Host",  modifier = required,  db_index = False ];
-  required bool read_only = 5 [ null = False,  default = False,  blank = True,  help_text = "True if mount read-only",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xoscomponentvolumecontainer.proto b/xos/genx/protos/core/xoscomponentvolumecontainer.proto
deleted file mode 100644
index c983894..0000000
--- a/xos/genx/protos/core/xoscomponentvolumecontainer.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message XOSComponentVolumeContainer {
-  required int32 component = 1 [ null = False,  blank = False,  help_text = "The Component object for this VolumeContainer",  model = XOSComponent,  modifier = required,  type = link,  port = volumecontainers,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 300,  content_type = "stripped",  blank = False,  help_text = "Volume Name",  modifier = required,  db_index = False ];
-  required string container = 3 [ null = False,  max_length = 300,  content_type = "stripped",  blank = False,  help_text = "Volume Name",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xosguiextension.proto b/xos/genx/protos/core/xosguiextension.proto
deleted file mode 100644
index 3efe212..0000000
--- a/xos/genx/protos/core/xosguiextension.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-message XOSGuiExtension {
-  required string name = 1 [ null = False,  max_length = 200,  content_type = "stripped",  blank = False,  help_text = "Name of the GUI Extensions",  modifier = required,  db_index = False ];
-  required string files = 2 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "List of comma separated file composing the view",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/core/xosvolume.proto b/xos/genx/protos/core/xosvolume.proto
deleted file mode 100644
index 659c548..0000000
--- a/xos/genx/protos/core/xosvolume.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message XOSVolume {
-  required int32 xos = 1 [ null = False,  blank = False,  help_text = "The XOS object for this Volume",  model = XOS,  modifier = required,  type = link,  port = volumes,  db_index = True ];
-  required string container_path = 2 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "Path of Volume in Container",  modifier = required,  db_index = False ];
-  required string host_path = 3 [ null = False,  max_length = 1024,  content_type = "stripped",  blank = False,  help_text = "Path of Volume in Host",  modifier = required,  db_index = False ];
-  required bool read_only = 4 [ null = False,  default = False,  blank = True,  help_text = "True if mount read-only",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/accessagent.proto b/xos/genx/protos/services/accessagent.proto
deleted file mode 100644
index 8ffc493..0000000
--- a/xos/genx/protos/services/accessagent.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message AccessAgent {
-  required string name = 1 [ null = False,  max_length = 254,  blank = False,  help_text = "name of agent",  modifier = required,  db_index = False ];
-  required int32 volt_service = 2 [ null = False,  blank = False,  model = VOLTService,  modifier = required,  type = link,  port = access_agents,  db_index = True ];
-  optional string mac = 3 [ null = True,  max_length = 32,  blank = True,  help_text = "MAC Address or Access Agent",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/accessdevice.proto b/xos/genx/protos/services/accessdevice.proto
deleted file mode 100644
index b2b7caa..0000000
--- a/xos/genx/protos/services/accessdevice.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message AccessDevice {
-  required int32 volt_device = 1 [ null = False,  blank = False,  model = VOLTDevice,  modifier = required,  type = link,  port = access_devices,  db_index = True ];
-  optional int32 uplink = 2 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 vlan = 3 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/agentportmapping.proto b/xos/genx/protos/services/agentportmapping.proto
deleted file mode 100644
index fbbba9d..0000000
--- a/xos/genx/protos/services/agentportmapping.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message AgentPortMapping {
-  required int32 access_agent = 1 [ null = False,  blank = False,  model = AccessAgent,  modifier = required,  type = link,  port = port_mappings,  db_index = True ];
-  optional string mac = 2 [ null = True,  max_length = 32,  blank = True,  help_text = "MAC Address",  modifier = optional,  db_index = False ];
-  optional string port = 3 [ null = True,  max_length = 32,  blank = True,  help_text = "Openflow port ID",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/cordsubscriberroot.proto b/xos/genx/protos/services/cordsubscriberroot.proto
deleted file mode 100644
index 8fa0603..0000000
--- a/xos/genx/protos/services/cordsubscriberroot.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-message CordSubscriberRoot {
-  required string kind = 1 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string name = 2 [ null = True,  max_length = 255,  content_type = "stripped",  blank = True,  help_text = "name",  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 3 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string service_specific_id = 4 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required bool firewall_enable = 5 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  optional string firewall_rules = 6 [ db_index = False,  default = "accept all anywhere anywhere",  modifier = optional,  null = True,  blank = True ];
-  required bool url_filter_enable = 7 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  optional string url_filter_rules = 8 [ db_index = False,  default = "allow all",  modifier = optional,  null = True,  blank = True ];
-  required string url_filter_level = 9 [ null = False,  default = "PG",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required bool cdn_enable = 10 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  required bool is_demo_user = 11 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  required int32 uplink_speed = 12 [ db_index = False,  default = 1000000000,  modifier = required,  null = False,  blank = False ];
-  required int32 downlink_speed = 13 [ db_index = False,  default = 1000000000,  modifier = required,  null = False,  blank = False ];
-  required bool enable_uverse = 14 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string status = 15 [ null = False,  default = "enabled",  choices = "(('enabled', 'Enabled'), ('suspended', 'Suspended'), ('delinquent', 'Delinquent'), ('copyrightviolation', 'Copyright Violation'))",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/exampleservice.proto b/xos/genx/protos/services/exampleservice.proto
deleted file mode 100644
index 20368c9..0000000
--- a/xos/genx/protos/services/exampleservice.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-message ExampleService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-  required string service_message = 14 [ null = False,  max_length = 254,  blank = False,  help_text = "Service Message to Display",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/fabricservice.proto b/xos/genx/protos/services/fabricservice.proto
deleted file mode 100644
index d1187a4..0000000
--- a/xos/genx/protos/services/fabricservice.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-message FabricService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-  required bool autoconfig = 14 [ null = False,  default = True,  blank = True,  help_text = "Autoconfigure the fabric",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/onosapp.proto b/xos/genx/protos/services/onosapp.proto
deleted file mode 100644
index 66bd612..0000000
--- a/xos/genx/protos/services/onosapp.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-message ONOSApp {
-  optional string name = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 provider_service = 3 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = provided_tenants,  db_index = True ];
-  optional int32 subscriber_service = 4 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_tenant = 5 [ null = True,  blank = True,  model = Tenant,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_user = 6 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_root = 7 [ null = True,  blank = True,  model = TenantRoot,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_network = 8 [ null = True,  blank = True,  model = Network,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional string service_specific_id = 9 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 10 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string connect_method = 11 [ null = False,  default = "na",  choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  optional string install_dependencies = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string dependencies = 13 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 creator = 14 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = onos_apps,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/onosservice.proto b/xos/genx/protos/services/onosservice.proto
deleted file mode 100644
index 04b476b..0000000
--- a/xos/genx/protos/services/onosservice.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-
-message ONOSService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-  optional string rest_hostname = 14 [ null = True,  max_length = 255,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required int32 rest_port = 15 [ db_index = False,  default = 8181,  modifier = required,  null = False,  blank = False ];
-  required bool no_container = 16 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-  optional string node_key = 17 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/voltdevice.proto b/xos/genx/protos/services/voltdevice.proto
deleted file mode 100644
index 45b85d9..0000000
--- a/xos/genx/protos/services/voltdevice.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-message VOLTDevice {
-  required string name = 1 [ null = False,  max_length = 254,  blank = False,  help_text = "name of device",  modifier = required,  db_index = False ];
-  required int32 volt_service = 2 [ null = False,  blank = False,  model = VOLTService,  modifier = required,  type = link,  port = volt_devices,  db_index = True ];
-  optional string openflow_id = 3 [ null = True,  max_length = 254,  blank = True,  help_text = "OpenFlow ID",  modifier = optional,  db_index = False ];
-  optional string driver = 4 [ null = True,  max_length = 254,  blank = True,  help_text = "driver",  modifier = optional,  db_index = False ];
-  optional int32 access_agent = 5 [ null = True,  blank = True,  model = AccessAgent,  modifier = optional,  type = link,  port = volt_devices,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/voltservice.proto b/xos/genx/protos/services/voltservice.proto
deleted file mode 100644
index 2d353b3..0000000
--- a/xos/genx/protos/services/voltservice.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-
-message VOLTService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/volttenant.proto b/xos/genx/protos/services/volttenant.proto
deleted file mode 100644
index afbe64a..0000000
--- a/xos/genx/protos/services/volttenant.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-message VOLTTenant {
-  optional string name = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 provider_service = 3 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = provided_tenants,  db_index = True ];
-  optional int32 subscriber_service = 4 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_tenant = 5 [ null = True,  blank = True,  model = Tenant,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_user = 6 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_root = 7 [ null = True,  blank = True,  model = TenantRoot,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_network = 8 [ null = True,  blank = True,  model = Network,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional string service_specific_id = 9 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 10 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string connect_method = 11 [ null = False,  default = "na",  choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  optional int32 s_tag = 12 [ db_index = False,  help_text = "s-tag",  modifier = optional,  null = True,  blank = True ];
-  optional int32 c_tag = 13 [ db_index = False,  help_text = "c-tag",  modifier = optional,  null = True,  blank = True ];
-  optional int32 creator = 14 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = created_volts,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vrouterapp.proto b/xos/genx/protos/services/vrouterapp.proto
deleted file mode 100644
index ed4c22a..0000000
--- a/xos/genx/protos/services/vrouterapp.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message VRouterApp {
-  required int32 vrouter_service = 1 [ null = False,  blank = False,  model = VRouterService,  modifier = required,  type = link,  port = apps,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 50,  blank = False,  help_text = "application name",  modifier = required,  db_index = False ];
-  required string control_plane_connect_point = 3 [ null = False,  max_length = 21,  blank = False,  help_text = "port identifier in ONOS",  modifier = required,  db_index = False ];
-  required bool ospf_enabled = 4 [ null = False,  default = True,  blank = True,  help_text = "ospf enabled",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vrouterdevice.proto b/xos/genx/protos/services/vrouterdevice.proto
deleted file mode 100644
index 1771282..0000000
--- a/xos/genx/protos/services/vrouterdevice.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-message VRouterDevice {
-  optional string name = 1 [ null = True,  max_length = 20,  blank = True,  help_text = "device friendly name",  modifier = optional,  db_index = False ];
-  required string openflow_id = 2 [ null = False,  max_length = 20,  blank = False,  help_text = "device identifier in ONOS",  modifier = required,  db_index = False ];
-  required string config_key = 3 [ null = False,  default = "basic",  max_length = 32,  blank = False,  help_text = "configuration key",  modifier = required,  db_index = False ];
-  required string driver = 4 [ null = False,  max_length = 32,  blank = False,  help_text = "driver type",  modifier = required,  db_index = False ];
-  required int32 vrouter_service = 5 [ null = False,  blank = False,  model = VRouterService,  modifier = required,  type = link,  port = devices,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vrouterinterface.proto b/xos/genx/protos/services/vrouterinterface.proto
deleted file mode 100644
index 31a20f7..0000000
--- a/xos/genx/protos/services/vrouterinterface.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message VRouterInterface {
-  required int32 vrouter_port = 1 [ null = False,  blank = False,  model = VRouterPort,  modifier = required,  type = link,  port = interfaces,  db_index = True ];
-  required string name = 2 [ null = False,  max_length = 10,  blank = False,  help_text = "interface name",  modifier = required,  db_index = False ];
-  required string mac = 3 [ null = False,  max_length = 17,  blank = False,  help_text = "interface mac",  modifier = required,  db_index = False ];
-  optional string vlan = 4 [ null = True,  max_length = 10,  blank = True,  help_text = "interface vlan id",  modifier = optional,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vrouterip.proto b/xos/genx/protos/services/vrouterip.proto
deleted file mode 100644
index 749731e..0000000
--- a/xos/genx/protos/services/vrouterip.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-message VRouterIp {
-  optional string name = 1 [ null = True,  max_length = 20,  blank = True,  help_text = "ip friendly name",  modifier = optional,  db_index = False ];
-  required int32 vrouter_interface = 2 [ null = False,  blank = False,  model = VRouterInterface,  modifier = required,  type = link,  port = ips,  db_index = True ];
-  required string ip = 3 [ null = False,  max_length = 19,  blank = False,  help_text = "interface ips",  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vrouterport.proto b/xos/genx/protos/services/vrouterport.proto
deleted file mode 100644
index 9d1e723..0000000
--- a/xos/genx/protos/services/vrouterport.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-message VRouterPort {
-  optional string name = 1 [ null = True,  max_length = 20,  blank = True,  help_text = "port friendly name",  modifier = optional,  db_index = False ];
-  required string openflow_id = 2 [ null = False,  max_length = 21,  blank = False,  help_text = "port identifier in ONOS",  modifier = required,  db_index = False ];
-  required int32 vrouter_device = 3 [ null = False,  blank = False,  model = VRouterDevice,  modifier = required,  type = link,  port = ports,  db_index = True ];
-  required int32 vrouter_service = 4 [ null = False,  blank = False,  model = VRouterService,  modifier = required,  type = link,  port = device_ports,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vrouterservice.proto b/xos/genx/protos/services/vrouterservice.proto
deleted file mode 100644
index af5e3b4..0000000
--- a/xos/genx/protos/services/vrouterservice.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-
-message VRouterService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-  optional string rest_hostname = 14 [ null = True,  max_length = 255,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required int32 rest_port = 15 [ db_index = False,  default = 8181,  modifier = required,  null = False,  blank = False ];
-  required string rest_user = 16 [ null = False,  default = "onos",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string rest_pass = 17 [ null = False,  default = "rocks",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vroutertenant.proto b/xos/genx/protos/services/vroutertenant.proto
deleted file mode 100644
index 580af29..0000000
--- a/xos/genx/protos/services/vroutertenant.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-message VRouterTenant {
-  optional string name = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 provider_service = 3 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = provided_tenants,  db_index = True ];
-  optional int32 subscriber_service = 4 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_tenant = 5 [ null = True,  blank = True,  model = Tenant,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_user = 6 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_root = 7 [ null = True,  blank = True,  model = TenantRoot,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_network = 8 [ null = True,  blank = True,  model = Network,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional string service_specific_id = 9 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 10 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string connect_method = 11 [ null = False,  default = "na",  choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  optional string public_ip = 12 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_mac = 13 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional int32 address_pool = 14 [ null = True,  blank = True,  model = AddressPool,  modifier = optional,  type = link,  port = vrouter_tenants,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vsgservice.proto b/xos/genx/protos/services/vsgservice.proto
deleted file mode 100644
index 1bf25f0..0000000
--- a/xos/genx/protos/services/vsgservice.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-message VSGService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-  optional string url_filter_kind = 14 [ null = True,  choices = "((None, 'None'), ('safebrowsing', 'Safe Browsing'), ('answerx', 'AnswerX'))",  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string dns_servers = 15 [ null = False,  default = "8.8.8.8",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  optional string node_label = 16 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string docker_image_name = 17 [ null = False,  default = "docker.io/xosproject/vsg",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required bool docker_insecure_registry = 18 [ db_index = False,  default = False,  modifier = required,  null = False,  blank = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vtnservice.proto b/xos/genx/protos/services/vtnservice.proto
deleted file mode 100644
index 5a2e41a..0000000
--- a/xos/genx/protos/services/vtnservice.proto
+++ /dev/null
@@ -1,28 +0,0 @@
-
-message VTNService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-  required string privateGatewayMac = 14 [ null = False,  default = "00:00:00:00:00:01",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string localManagementIp = 15 [ null = False,  default = "172.27.0.1/24",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 ovsdbPort = 16 [ db_index = False,  default = 6641,  modifier = required,  null = False,  blank = False ];
-  required int32 sshPort = 17 [ db_index = False,  default = 22,  modifier = required,  null = False,  blank = False ];
-  required string sshUser = 18 [ null = False,  default = "root",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string sshKeyFile = 19 [ null = False,  default = "/root/node_key",  max_length = 1024,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 mgmtSubnetBits = 20 [ db_index = False,  default = 24,  modifier = required,  null = False,  blank = False ];
-  required string xosEndpoint = 21 [ null = False,  default = "http://xos/",  max_length = 1024,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string xosUser = 22 [ null = False,  default = "padmin@vicci.org",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required string xosPassword = 23 [ null = False,  default = "letmein",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 vtnAPIVersion = 24 [ db_index = False,  default = 1,  modifier = required,  null = False,  blank = False ];
-  required string controllerPort = 25 [ null = False,  default = "onos-cord:6653",  max_length = 255,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vtrservice.proto b/xos/genx/protos/services/vtrservice.proto
deleted file mode 100644
index 0ad6a1d..0000000
--- a/xos/genx/protos/services/vtrservice.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-
-message VTRService {
-  optional string description = 1 [ null = True,  max_length = 254,  blank = True,  help_text = "Description of Service",  modifier = optional,  db_index = False ];
-  required bool enabled = 2 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  required string kind = 3 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Kind of service",  modifier = required,  db_index = False ];
-  required string name = 4 [ null = False,  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "Service Name",  modifier = required,  db_index = False ];
-  optional string versionNumber = 5 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  help_text = "Version of Service Definition",  modifier = optional,  db_index = False ];
-  required bool published = 6 [ db_index = False,  default = True,  modifier = required,  null = False,  blank = True ];
-  optional string view_url = 7 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string icon_url = 8 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string public_key = 9 [ null = True,  max_length = 1024,  blank = True,  help_text = "Public key string",  modifier = optional,  db_index = False ];
-  optional string private_key_fn = 10 [ null = True,  max_length = 1024,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_id = 11 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 12 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional int32 controller = 13 [ null = True,  blank = True,  help_text = "The Service Controller this Service uses",  model = ServiceController,  modifier = optional,  type = link,  port = services,  db_index = True ];
-}
\ No newline at end of file
diff --git a/xos/genx/protos/services/vtrtenant.proto b/xos/genx/protos/services/vtrtenant.proto
deleted file mode 100644
index 54d6e60..0000000
--- a/xos/genx/protos/services/vtrtenant.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-message VTRTenant {
-  optional string name = 1 [ null = True,  max_length = 200,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required string kind = 2 [ null = False,  default = "generic",  max_length = 30,  content_type = "stripped",  blank = False,  modifier = required,  db_index = False ];
-  required int32 provider_service = 3 [ null = False,  blank = False,  model = Service,  modifier = required,  type = link,  port = provided_tenants,  db_index = True ];
-  optional int32 subscriber_service = 4 [ null = True,  blank = True,  model = Service,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_tenant = 5 [ null = True,  blank = True,  model = Tenant,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_user = 6 [ null = True,  blank = True,  model = User,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_root = 7 [ null = True,  blank = True,  model = TenantRoot,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional int32 subscriber_network = 8 [ null = True,  blank = True,  model = Network,  modifier = optional,  type = link,  port = subscribed_tenants,  db_index = True ];
-  optional string service_specific_id = 9 [ null = True,  max_length = 30,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string service_specific_attribute = 10 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  required string connect_method = 11 [ null = False,  default = "na",  choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))",  max_length = 30,  blank = False,  modifier = required,  db_index = False ];
-  required string test = 12 [ null = False,  choices = "(('ping', 'Ping'), ('traceroute', 'Trace Route'), ('tcpdump', 'Tcp Dump'))",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "type of test",  modifier = required,  db_index = False ];
-  required string scope = 13 [ null = False,  choices = "(('container', 'Container'), ('vm', 'VM'))",  max_length = 30,  content_type = "stripped",  blank = False,  help_text = "scope of test",  modifier = required,  db_index = False ];
-  optional string argument = 14 [ null = True,  max_length = 40,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  optional string result = 15 [ db_index = False,  modifier = optional,  null = True,  blank = True ];
-  optional string result_code = 16 [ null = True,  max_length = 32,  content_type = "stripped",  blank = True,  modifier = optional,  db_index = False ];
-  required int32 target_type = 17 [ null = False,  blank = False,  model = ContentType,  modifier = required,  type = link,  port = vtrtenant,  db_index = True ];
-  required uint32 target_id = 18 [ db_index = False,  modifier = required,  null = False,  blank = False ];
-}
\ No newline at end of file
diff --git a/xos/genx/xprotos/core/account.xproto b/xos/genx/xprotos/core/account.xproto
deleted file mode 100644
index ba24140..0000000
--- a/xos/genx/xprotos/core/account.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message Account (PlCoreBase){
-     required manytoone site->Site:accounts = 1 [help_text = "Site for this account", null = False, db_index = True, blank = False];
-}
diff --git a/xos/genx/xprotos/core/addresspool.xproto b/xos/genx/xprotos/core/addresspool.xproto
deleted file mode 100644
index 737de26..0000000
--- a/xos/genx/xprotos/core/addresspool.xproto
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-message AddressPool (PlCoreBase){
-     required string name = 1 [db_index = False, max_length = 32, null = False, blank = False];
-     optional string addresses = 2 [db_index = False, null = True, blank = True];
-     optional string gateway_ip = 3 [db_index = False, max_length = 32, null = True, blank = False];
-     optional string gateway_mac = 4 [db_index = False, max_length = 32, null = True, blank = False];
-     optional string cidr = 5 [db_index = False, max_length = 32, null = True, blank = False];
-     optional string inuse = 6 [db_index = False, null = True, blank = True];
-     optional manytoone service->Service:addresspools = 7 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/core/charge.xproto b/xos/genx/xprotos/core/charge.xproto
deleted file mode 100644
index df45134..0000000
--- a/xos/genx/xprotos/core/charge.xproto
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-message Charge (PlCoreBase){
-     required manytoone account->Account:charges = 1 [db_index = True, null = False, blank = False];
-     optional manytoone slice->Slice:charges = 2 [db_index = True, null = True, blank = True];
-     required string kind = 3 [default = "besteffort", choices = "(('besteffort', 'besteffort'), ('reservation', 'reservation'), ('monthlyfee', 'monthlyfee'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string state = 4 [default = "pending", choices = "(('pending', 'pending'), ('invoiced', 'invoiced'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string date = 5 [db_index = False, null = False, content_type = "date", blank = False];
-     required manytoone object->UsableObject:charge = 6 [db_index = True, null = False, blank = False];
-     required float amount = 7 [default = 0.0, null = False, db_index = False, blank = False];
-     required float coreHours = 8 [default = 0.0, null = False, db_index = False, blank = False];
-     optional manytoone invoice->Invoice:charges = 9 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/core/controller.xproto b/xos/genx/xprotos/core/controller.xproto
deleted file mode 100644
index da2d1e3..0000000
--- a/xos/genx/xprotos/core/controller.xproto
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-message Controller (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of the Controller", null = False, db_index = False];
-     required string backend_type = 2 [max_length = 200, content_type = "stripped", blank = False, help_text = "Type of compute controller, e.g. EC2, OpenStack, or OpenStack version", null = False, db_index = False];
-     required string version = 3 [max_length = 200, content_type = "stripped", blank = False, help_text = "Controller version", null = False, db_index = False];
-     optional string auth_url = 4 [max_length = 200, content_type = "stripped", blank = True, help_text = "Auth url for the compute controller", null = True, db_index = False];
-     optional string admin_user = 5 [max_length = 200, content_type = "stripped", blank = True, help_text = "Username of an admin user at this controller", null = True, db_index = False];
-     optional string admin_password = 6 [max_length = 200, content_type = "stripped", blank = True, help_text = "Password of theadmin user at this controller", null = True, db_index = False];
-     optional string admin_tenant = 7 [max_length = 200, content_type = "stripped", blank = True, help_text = "Name of the tenant the admin user belongs to", null = True, db_index = False];
-     optional string domain = 8 [max_length = 200, content_type = "stripped", blank = True, help_text = "Name of the domain this controller belongs to", null = True, db_index = False];
-     optional string rabbit_host = 9 [max_length = 200, content_type = "stripped", blank = True, help_text = "IP address of rabbitmq server at this controller", null = True, db_index = False];
-     optional string rabbit_user = 10 [max_length = 200, content_type = "stripped", blank = True, help_text = "Username of rabbitmq server at this controller", null = True, db_index = False];
-     optional string rabbit_password = 11 [max_length = 200, content_type = "stripped", blank = True, help_text = "Password of rabbitmq server at this controller", null = True, db_index = False];
-     required manytoone deployment->Deployment:controllerdeployments = 12 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/controllerdashboardview.xproto b/xos/genx/xprotos/core/controllerdashboardview.xproto
deleted file mode 100644
index ed4229c..0000000
--- a/xos/genx/xprotos/core/controllerdashboardview.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message ControllerDashboardView (PlCoreBase){
-     required manytoone controller->Controller:controllerdashboardviews = 1 [db_index = True, null = False, blank = False];
-     required manytoone dashboardView->DashboardView:controllerdashboardviews = 2 [db_index = True, null = False, blank = False];
-     required bool enabled = 3 [default = True, null = False, db_index = False, blank = True];
-     required string url = 4 [max_length = 1024, content_type = "stripped", blank = False, help_text = "URL of Dashboard", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/controllerimages.xproto b/xos/genx/xprotos/core/controllerimages.xproto
deleted file mode 100644
index 38d6237..0000000
--- a/xos/genx/xprotos/core/controllerimages.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ControllerImages (PlCoreBase){
-     required manytoone image->Image:controllerimages = 1 [db_index = True, null = False, blank = False];
-     required manytoone controller->Controller:controllerimages = 2 [db_index = True, null = False, blank = False];
-     optional string glance_image_id = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "Glance image id", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/controllernetwork.xproto b/xos/genx/xprotos/core/controllernetwork.xproto
deleted file mode 100644
index ba6acec..0000000
--- a/xos/genx/xprotos/core/controllernetwork.xproto
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-message ControllerNetwork (PlCoreBase){
-     required manytoone network->Network:controllernetworks = 1 [db_index = True, null = False, blank = False];
-     required manytoone controller->Controller:controllernetworks = 2 [db_index = True, null = False, blank = False];
-     required string subnet = 3 [db_index = False, max_length = 32, null = False, blank = True];
-     required string start_ip = 4 [db_index = False, max_length = 32, null = False, blank = True];
-     required string stop_ip = 5 [db_index = False, max_length = 32, null = False, blank = True];
-     optional string net_id = 6 [help_text = "Neutron network", max_length = 256, null = True, db_index = False, blank = True];
-     optional string router_id = 7 [help_text = "Neutron router id", max_length = 256, null = True, db_index = False, blank = True];
-     optional string subnet_id = 8 [help_text = "Neutron subnet id", max_length = 256, null = True, db_index = False, blank = True];
-     optional string gateway = 9 [db_index = False, max_length = 32, null = True, blank = True];
-     optional string segmentation_id = 10 [db_index = False, max_length = 32, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/core/controllerrole.xproto b/xos/genx/xprotos/core/controllerrole.xproto
deleted file mode 100644
index 4ae4bb2..0000000
--- a/xos/genx/xprotos/core/controllerrole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message ControllerRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'),)", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/controllersite.xproto b/xos/genx/xprotos/core/controllersite.xproto
deleted file mode 100644
index 6fb4be8..0000000
--- a/xos/genx/xprotos/core/controllersite.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ControllerSite (PlCoreBase){
-     required manytoone site->Site:controllersite = 1 [db_index = True, null = False, blank = False];
-     optional manytoone controller->Controller:controllersite = 2 [db_index = True, null = True, blank = True];
-     optional string tenant_id = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "Keystone tenant id", null = True, db_index = True];
-}
diff --git a/xos/genx/xprotos/core/controllersiteprivilege.xproto b/xos/genx/xprotos/core/controllersiteprivilege.xproto
deleted file mode 100644
index ca5ca75..0000000
--- a/xos/genx/xprotos/core/controllersiteprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ControllerSitePrivilege (PlCoreBase){
-     required manytoone controller->Controller:controllersiteprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone site_privilege->SitePrivilege:controllersiteprivileges = 2 [db_index = True, null = False, blank = False];
-     optional string role_id = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "Keystone id", null = True, db_index = True];
-}
diff --git a/xos/genx/xprotos/core/controllerslice.xproto b/xos/genx/xprotos/core/controllerslice.xproto
deleted file mode 100644
index 46e15ae..0000000
--- a/xos/genx/xprotos/core/controllerslice.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ControllerSlice (PlCoreBase){
-     required manytoone controller->Controller:controllerslices = 1 [db_index = True, null = False, blank = False];
-     required manytoone slice->Slice:controllerslices = 2 [db_index = True, null = False, blank = False];
-     optional string tenant_id = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "Keystone tenant id", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/controllersliceprivilege.xproto b/xos/genx/xprotos/core/controllersliceprivilege.xproto
deleted file mode 100644
index c1308dc..0000000
--- a/xos/genx/xprotos/core/controllersliceprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ControllerSlicePrivilege (PlCoreBase){
-     required manytoone controller->Controller:controllersliceprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone slice_privilege->SlicePrivilege:controllersliceprivileges = 2 [db_index = True, null = False, blank = False];
-     optional string role_id = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "Keystone id", null = True, db_index = True];
-}
diff --git a/xos/genx/xprotos/core/controlleruser.xproto b/xos/genx/xprotos/core/controlleruser.xproto
deleted file mode 100644
index 5560d6d..0000000
--- a/xos/genx/xprotos/core/controlleruser.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ControllerUser (PlCoreBase){
-     required manytoone user->User:controllerusers = 1 [db_index = True, null = False, blank = False];
-     required manytoone controller->Controller:controllersusers = 2 [db_index = True, null = False, blank = False];
-     optional string kuser_id = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "Keystone user id", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/dashboardview.xproto b/xos/genx/xprotos/core/dashboardview.xproto
deleted file mode 100644
index 76e4f30..0000000
--- a/xos/genx/xprotos/core/dashboardview.xproto
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-message DashboardView (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of the View", null = False, db_index = False];
-     required string url = 2 [max_length = 1024, content_type = "stripped", blank = False, help_text = "URL of Dashboard", null = False, db_index = False];
-     required bool enabled = 3 [default = True, null = False, db_index = False, blank = True];
-     required string icon = 4 [default = "default-icon.png", max_length = 200, blank = False, help_text = "Icon for Dashboard", null = False, db_index = False];
-     required string icon_active = 5 [default = "default-icon-active.png", max_length = 200, blank = False, help_text = "Icon for active Dashboard", null = False, db_index = False];
-     required manytomany controllers->Controller/ControllerDashboardView:dashboardviews = 6 [db_index = False, null = False, blank = True];
-     required manytomany deployments->Deployment/DashboardView_deployments:dashboardviews = 7 [help_text = "Deployments that should be included in this view", null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/deployment.xproto b/xos/genx/xprotos/core/deployment.xproto
deleted file mode 100644
index 779f74d..0000000
--- a/xos/genx/xprotos/core/deployment.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message Deployment (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of the Deployment", null = False, db_index = False];
-     required string accessControl = 2 [default = "allow all", max_length = 200, blank = False, help_text = "Access control list that specifies which sites/users may use nodes in this deployment", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/deploymentprivilege.xproto b/xos/genx/xprotos/core/deploymentprivilege.xproto
deleted file mode 100644
index 33efc2a..0000000
--- a/xos/genx/xprotos/core/deploymentprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message DeploymentPrivilege (PlCoreBase){
-     required manytoone user->User:deploymentprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone deployment->Deployment:deploymentprivileges = 2 [db_index = True, null = False, blank = False];
-     required manytoone role->DeploymentRole:deploymentprivileges = 3 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/deploymentrole.xproto b/xos/genx/xprotos/core/deploymentrole.xproto
deleted file mode 100644
index 61adab5..0000000
--- a/xos/genx/xprotos/core/deploymentrole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message DeploymentRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'),)", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/diag.xproto b/xos/genx/xprotos/core/diag.xproto
deleted file mode 100644
index 7869f50..0000000
--- a/xos/genx/xprotos/core/diag.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message Diag (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of the synchronizer", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/flavor.xproto b/xos/genx/xprotos/core/flavor.xproto
deleted file mode 100644
index d30a7c2..0000000
--- a/xos/genx/xprotos/core/flavor.xproto
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-message Flavor (PlCoreBase){
-     required string name = 1 [max_length = 32, content_type = "stripped", blank = False, help_text = "name of this flavor, as displayed to users", null = False, db_index = False];
-     optional string description = 2 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     required string flavor = 3 [max_length = 32, content_type = "stripped", blank = False, help_text = "flavor string used to configure deployments", null = False, db_index = False];
-     required int32 order = 4 [help_text = "used to order flavors when displayed in a list", default = 0, null = False, db_index = False, blank = False];
-     required bool default = 5 [help_text = "make this a default flavor to use when creating new instances", default = False, null = False, db_index = False, blank = True];
-     required manytomany deployments->Deployment/DashboardView_deployments:flavors = 6 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/image.xproto b/xos/genx/xprotos/core/image.xproto
deleted file mode 100644
index aa24371..0000000
--- a/xos/genx/xprotos/core/image.xproto
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-message Image (PlCoreBase){
-     required string name = 1 [db_index = False, max_length = 256, null = False, content_type = "stripped", blank = False];
-     required string kind = 2 [default = "vm", choices = "(('vm', 'Virtual Machine'), ('container', 'Container'))", max_length = 30, blank = False, null = False, db_index = False];
-     required string disk_format = 3 [db_index = False, max_length = 256, null = False, content_type = "stripped", blank = False];
-     required string container_format = 4 [db_index = False, max_length = 256, null = False, content_type = "stripped", blank = False];
-     optional string path = 5 [max_length = 256, content_type = "stripped", blank = True, help_text = "Path to image on local disk", null = True, db_index = False];
-     optional string tag = 6 [max_length = 256, content_type = "stripped", blank = True, help_text = "For Docker Images, tag of image", null = True, db_index = False];
-     required manytomany deployments->Deployment/DashboardView_deployments:images = 7 [help_text = "Select which images should be instantiated on this deployment", null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/imagedeployments.xproto b/xos/genx/xprotos/core/imagedeployments.xproto
deleted file mode 100644
index e11fedb..0000000
--- a/xos/genx/xprotos/core/imagedeployments.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message ImageDeployments (PlCoreBase){
-     required manytoone image->Image:imagedeployments = 1 [db_index = True, null = False, blank = False];
-     required manytoone deployment->Deployment:imagedeployments = 2 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/instance.xproto b/xos/genx/xprotos/core/instance.xproto
deleted file mode 100644
index b411bd4..0000000
--- a/xos/genx/xprotos/core/instance.xproto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-message Instance (PlCoreBase){
-     optional string instance_id = 1 [max_length = 200, content_type = "stripped", blank = True, help_text = "Nova instance id", null = True, db_index = False];
-     optional string instance_uuid = 2 [max_length = 200, content_type = "stripped", blank = True, help_text = "Nova instance uuid", null = True, db_index = False];
-     required string name = 3 [max_length = 200, content_type = "stripped", blank = False, help_text = "Instance name", null = False, db_index = False];
-     optional string instance_name = 4 [max_length = 200, content_type = "stripped", blank = True, help_text = "OpenStack generated name", null = True, db_index = False];
-     optional string ip = 5 [max_length = 39, content_type = "ip", blank = True, help_text = "Instance ip address", null = True, db_index = False];
-     required manytoone image->Image:instances = 6 [db_index = True, null = False, blank = False];
-     optional manytoone creator->User:instances = 7 [db_index = True, null = True, blank = True];
-     required manytoone slice->Slice:instances = 8 [db_index = True, null = False, blank = False];
-     required manytoone deployment->Deployment:instance_deployment = 9 [db_index = True, null = False, blank = False];
-     required manytoone node->Node:instances = 10 [db_index = True, null = False, blank = False];
-     required int32 numberCores = 11 [help_text = "Number of cores for instance", default = 0, null = False, db_index = False, blank = False];
-     required manytoone flavor->Flavor:instance = 12 [help_text = "Flavor of this instance", default = "get_default_flavor()", null = False, db_index = True, blank = False];
-     optional string userData = 13 [help_text = "user_data passed to instance during creation", null = True, db_index = False, blank = True];
-     required string isolation = 14 [default = "vm", choices = "(('vm', 'Virtual Machine'), ('container', 'Container'), ('container_vm', 'Container In VM'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string volumes = 15 [help_text = "Comma-separated list of directories to expose to parent context", null = True, db_index = False, blank = True];
-     optional manytoone parent->Instance:instance = 16 [help_text = "Parent Instance for containers nested inside of VMs", null = True, db_index = True, blank = True];
-     required manytomany tags->Tag = 17 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/invoice.xproto b/xos/genx/xprotos/core/invoice.xproto
deleted file mode 100644
index 7c05a58..0000000
--- a/xos/genx/xprotos/core/invoice.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message Invoice (PlCoreBase){
-     required string date = 1 [db_index = False, null = False, content_type = "date", blank = False];
-     required manytoone account->Account:invoices = 2 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/library.xproto b/xos/genx/xprotos/core/library.xproto
deleted file mode 100644
index 8505547..0000000
--- a/xos/genx/xprotos/core/library.xproto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-message Library (LoadableModule){
-}
diff --git a/xos/genx/xprotos/core/loadablemodule.xproto b/xos/genx/xprotos/core/loadablemodule.xproto
deleted file mode 100644
index 9f953d4..0000000
--- a/xos/genx/xprotos/core/loadablemodule.xproto
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-message LoadableModule (PlCoreBase){
-     required manytoone xos->XOS:loadable_modules = 1 [help_text = "Pointer to XOS", default = "get_xos()", null = False, db_index = True, blank = False];
-     required string name = 2 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string base_url = 3 [max_length = 1024, content_type = "stripped", blank = True, help_text = "Base URL, allows use of relative URLs for resources", null = True, db_index = False];
-     optional string version = 4 [default = "1.0.0", max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Controller", null = True, db_index = False];
-     optional string provides = 5 [max_length = 254, content_type = "stripped", blank = True, help_text = "Comma-separated list of things provided", null = True, db_index = False];
-     optional string requires = 6 [max_length = 254, content_type = "stripped", blank = True, help_text = "Comma-separated list of required Service Controllers", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/loadablemoduleresource.xproto b/xos/genx/xprotos/core/loadablemoduleresource.xproto
deleted file mode 100644
index f91729f..0000000
--- a/xos/genx/xprotos/core/loadablemoduleresource.xproto
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-message LoadableModuleResource (PlCoreBase){
-     required manytoone loadable_module->LoadableModule:loadable_module_resources = 1 [help_text = "The Loadable Module this resource is associated with", null = False, db_index = True, blank = False];
-     required string name = 2 [max_length = 30, content_type = "stripped", blank = False, help_text = "Object Name", null = False, db_index = False];
-     optional string subdirectory = 3 [max_length = 1024, content_type = "stripped", blank = True, help_text = "optional subdirectory", null = True, db_index = False];
-     required string kind = 4 [choices = "(('models', 'Models'), ('admin', 'Admin'), ('admin_template', 'Admin Template'), ('django_library', 'Django Library'), ('synchronizer', 'Synchronizer'), ('rest_service', 'REST API (service)'), ('rest_tenant', 'REST API (tenant)'), ('tosca_custom_types', 'Tosca Custom Types'), ('tosca_resource', 'Tosca Resource'), ('private_key', 'Private Key'), ('public_key', 'Public Key'), ('vendor_js', 'Vendor Javascript'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string format = 5 [choices = "(('python', 'Python'), ('manifest', 'Manifest'), ('docker', 'Docker Container'), ('yaml', 'YAML'), ('raw', 'raw'), ('javascript', 'Javascript'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     optional string url = 6 [max_length = 1024, content_type = "stripped", blank = True, help_text = "URL of resource", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/network.xproto b/xos/genx/xprotos/core/network.xproto
deleted file mode 100644
index b2495b4..0000000
--- a/xos/genx/xprotos/core/network.xproto
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-message Network (PlCoreBase,ParameterMixin){
-     required string name = 1 [db_index = False, max_length = 32, null = False, blank = False];
-     required manytoone template->NetworkTemplate:network = 2 [db_index = True, null = False, blank = False];
-     required string subnet = 3 [db_index = False, max_length = 32, null = False, blank = True];
-     required string start_ip = 4 [db_index = False, max_length = 32, null = False, blank = True];
-     required string end_ip = 5 [db_index = False, max_length = 32, null = False, blank = True];
-     optional string ports = 6 [db_index = False, max_length = 1024, null = True, blank = True];
-     optional string labels = 7 [db_index = False, max_length = 1024, null = True, blank = True];
-     required manytoone owner->Slice:ownedNetworks = 8 [help_text = "Slice that owns control of this Network", null = False, db_index = True, blank = False];
-     required int32 guaranteed_bandwidth = 9 [default = 0, null = False, db_index = False, blank = False];
-     required bool permit_all_slices = 10 [default = False, null = False, db_index = False, blank = True];
-     optional string topology_parameters = 11 [db_index = False, null = True, blank = True];
-     optional string controller_url = 12 [db_index = False, max_length = 1024, null = True, blank = True];
-     optional string controller_parameters = 13 [db_index = False, null = True, blank = True];
-     optional string network_id = 14 [help_text = "Quantum network", max_length = 256, null = True, db_index = False, blank = True];
-     optional string router_id = 15 [help_text = "Quantum router id", max_length = 256, null = True, db_index = False, blank = True];
-     optional string subnet_id = 16 [help_text = "Quantum subnet id", max_length = 256, null = True, db_index = False, blank = True];
-     required bool autoconnect = 17 [help_text = "This network can be autoconnected to the slice that owns it", default = True, null = False, db_index = False, blank = True];
-     required manytomany permitted_slices->Slice/NetworkSlice:availableNetworks = 18 [db_index = False, null = False, blank = True];
-     required manytomany slices->Slice/NetworkSlice:networks = 19 [db_index = False, null = False, blank = True];
-     required manytomany instances->Instance/Port:networks = 20 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/networkparameter.xproto b/xos/genx/xprotos/core/networkparameter.xproto
deleted file mode 100644
index 81585ee..0000000
--- a/xos/genx/xprotos/core/networkparameter.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message NetworkParameter (PlCoreBase){
-     required manytoone parameter->NetworkParameterType:networkparameters = 1 [help_text = "The type of the parameter", null = False, db_index = True, blank = False];
-     required string value = 2 [help_text = "The value of this parameter", max_length = 1024, null = False, db_index = False, blank = False];
-     required manytoone content_type->ContentType:networkparameter = 3 [db_index = True, null = False, blank = False];
-     required uint32 object_id = 4 [db_index = False, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/networkparametertype.xproto b/xos/genx/xprotos/core/networkparametertype.xproto
deleted file mode 100644
index 6eb7804..0000000
--- a/xos/genx/xprotos/core/networkparametertype.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message NetworkParameterType (PlCoreBase){
-     required string name = 1 [help_text = "The name of this parameter", max_length = 128, null = False, db_index = True, blank = False];
-     required string description = 2 [db_index = False, max_length = 1024, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/networkslice.xproto b/xos/genx/xprotos/core/networkslice.xproto
deleted file mode 100644
index 7ae04a2..0000000
--- a/xos/genx/xprotos/core/networkslice.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message NetworkSlice (PlCoreBase){
-     required manytoone network->Network:networkslices = 1 [db_index = True, null = False, blank = False];
-     required manytoone slice->Slice:networkslices = 2 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/networktemplate.xproto b/xos/genx/xprotos/core/networktemplate.xproto
deleted file mode 100644
index 3d17277..0000000
--- a/xos/genx/xprotos/core/networktemplate.xproto
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-message NetworkTemplate (PlCoreBase,ParameterMixin){
-     required string name = 1 [db_index = False, max_length = 32, null = False, blank = False];
-     optional string description = 2 [db_index = False, max_length = 1024, null = True, blank = True];
-     required int32 guaranteed_bandwidth = 3 [default = 0, null = False, db_index = False, blank = False];
-     required string visibility = 4 [default = "private", choices = "(('public', 'public'), ('private', 'private'))", max_length = 30, blank = False, null = False, db_index = False];
-     required string translation = 5 [default = "none", choices = "(('none', 'none'), ('NAT', 'NAT'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string access = 6 [choices = "((None, 'None'), ('indirect', 'Indirect'), ('direct', 'Direct'))", max_length = 30, blank = True, help_text = "Advertise this network as a means for other slices to contact this slice", null = True, db_index = False];
-     optional string shared_network_name = 7 [db_index = False, max_length = 30, null = True, blank = True];
-     optional string shared_network_id = 8 [help_text = "Quantum network", max_length = 256, null = True, db_index = False, blank = True];
-     required string topology_kind = 9 [default = "bigswitch", choices = "(('bigswitch', 'BigSwitch'), ('physical', 'Physical'), ('custom', 'Custom'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string controller_kind = 10 [blank = True, max_length = 30, null = True, db_index = False, choices = "((None, 'None'), ('onos', 'ONOS'), ('custom', 'Custom'))"];
-     optional string vtn_kind = 11 [default = "PRIVATE", choices = "(('PRIVATE', 'Private'), ('PUBLIC', 'Public'), ('MANAGEMENT_LOCAL', 'Management Local'), ('MANAGEMENT_HOST', 'Management Host'), ('VSG', 'VSG'), ('ACCESS_AGENT', 'Access Agent'))", max_length = 30, blank = True, null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/node.xproto b/xos/genx/xprotos/core/node.xproto
deleted file mode 100644
index 3a88b6a..0000000
--- a/xos/genx/xprotos/core/node.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message Node (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of the Node", null = False, db_index = False];
-     required manytoone site_deployment->SiteDeployment:nodes = 2 [db_index = True, null = False, blank = False];
-     optional manytoone site->Site:nodes = 3 [db_index = True, null = True, blank = True];
-     required manytomany tags->Tag = 4 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/nodelabel.xproto b/xos/genx/xprotos/core/nodelabel.xproto
deleted file mode 100644
index fc89a46..0000000
--- a/xos/genx/xprotos/core/nodelabel.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message NodeLabel (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "label name", null = False, db_index = False];
-     required manytomany node->Node/NodeLabel_node:nodelabels = 2 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/payment.xproto b/xos/genx/xprotos/core/payment.xproto
deleted file mode 100644
index f9723ad..0000000
--- a/xos/genx/xprotos/core/payment.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message Payment (PlCoreBase){
-     required manytoone account->Account:payments = 1 [db_index = True, null = False, blank = False];
-     required float amount = 2 [default = 0.0, null = False, db_index = False, blank = False];
-     required string date = 3 [default = "now()", null = False, db_index = False, content_type = "date", blank = False];
-}
diff --git a/xos/genx/xprotos/core/port.xproto b/xos/genx/xprotos/core/port.xproto
deleted file mode 100644
index a3a9cdc..0000000
--- a/xos/genx/xprotos/core/port.xproto
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-message Port (PlCoreBase,ParameterMixin){
-     required manytoone network->Network:links = 1 [db_index = True, null = False, blank = False];
-     optional manytoone instance->Instance:ports = 2 [db_index = True, null = True, blank = True];
-     optional string ip = 3 [max_length = 39, content_type = "ip", blank = True, help_text = "Instance ip address", null = True, db_index = False];
-     optional string port_id = 4 [help_text = "Neutron port id", max_length = 256, null = True, db_index = False, blank = True];
-     optional string mac = 5 [help_text = "MAC address associated with this port", max_length = 256, null = True, db_index = False, blank = True];
-     required bool xos_created = 6 [default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/program.xproto b/xos/genx/xprotos/core/program.xproto
deleted file mode 100644
index 38b083e..0000000
--- a/xos/genx/xprotos/core/program.xproto
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-message Program (PlCoreBase){
-     required string name = 1 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string description = 2 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required string kind = 3 [choices = "(('tosca', 'Tosca'),)", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     optional string command = 4 [choices = "(('run', 'Run'), ('destroy', 'Destroy'))", max_length = 30, content_type = "stripped", blank = True, help_text = "Command to run", null = True, db_index = False];
-     optional manytoone owner->User:programs = 5 [db_index = True, null = True, blank = False];
-     optional string contents = 6 [help_text = "Contents of Program", null = True, db_index = False, blank = True];
-     optional string output = 7 [help_text = "Output of Program", null = True, db_index = False, blank = True];
-     optional string messages = 8 [help_text = "Debug messages", null = True, db_index = False, blank = True];
-     optional string status = 9 [help_text = "Status of program", max_length = 30, null = True, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/project.xproto b/xos/genx/xprotos/core/project.xproto
deleted file mode 100644
index b7ea398..0000000
--- a/xos/genx/xprotos/core/project.xproto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-message Project (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of Project", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/protos.tar.gz b/xos/genx/xprotos/core/protos.tar.gz
deleted file mode 100644
index 31a3880..0000000
--- a/xos/genx/xprotos/core/protos.tar.gz
+++ /dev/null
Binary files differ
diff --git a/xos/genx/xprotos/core/reservation.xproto b/xos/genx/xprotos/core/reservation.xproto
deleted file mode 100644
index be00e7f..0000000
--- a/xos/genx/xprotos/core/reservation.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message Reservation (PlCoreBase){
-     required string startTime = 1 [db_index = False, null = False, content_type = "date", blank = False];
-     required manytoone slice->Slice:reservations = 2 [db_index = True, null = False, blank = False];
-     required int32 duration = 3 [default = 1, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/reservedresource.xproto b/xos/genx/xprotos/core/reservedresource.xproto
deleted file mode 100644
index d3baae7..0000000
--- a/xos/genx/xprotos/core/reservedresource.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message ReservedResource (PlCoreBase){
-     required manytoone instance->Instance:reservedresources = 1 [db_index = True, null = False, blank = False];
-     required manytoone resource->ServiceResource:reservedresources = 2 [db_index = True, null = False, blank = False];
-     required int32 quantity = 3 [default = 1, null = False, db_index = False, blank = False];
-     required manytoone reservationSet->Reservation:reservedresources = 4 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/role.xproto b/xos/genx/xprotos/core/role.xproto
deleted file mode 100644
index 2ebde68..0000000
--- a/xos/genx/xprotos/core/role.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message Role (PlCoreBase){
-     required string role_type = 1 [db_index = False, max_length = 80, null = False, content_type = "stripped", blank = False];
-     optional string role = 2 [db_index = False, max_length = 80, null = True, content_type = "stripped", blank = True];
-     required string description = 3 [db_index = False, max_length = 120, null = False, content_type = "stripped", blank = False];
-     required manytoone content_type->ContentType:role = 4 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/router.xproto b/xos/genx/xprotos/core/router.xproto
deleted file mode 100644
index da1e773..0000000
--- a/xos/genx/xprotos/core/router.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message Router (PlCoreBase){
-     required string name = 1 [db_index = False, max_length = 32, null = False, blank = False];
-     required manytoone owner->Slice:routers = 2 [db_index = True, null = False, blank = False];
-     required manytomany permittedNetworks->Network/Router_networks:availableRouters = 3 [db_index = False, null = False, blank = True];
-     required manytomany networks->Network/Router_networks:routers = 4 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/service.xproto b/xos/genx/xprotos/core/service.xproto
deleted file mode 100644
index e3ba5bb..0000000
--- a/xos/genx/xprotos/core/service.xproto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-message Service (PlCoreBase,AttributeMixin){
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-}
diff --git a/xos/genx/xprotos/core/serviceattribute.xproto b/xos/genx/xprotos/core/serviceattribute.xproto
deleted file mode 100644
index d333aa2..0000000
--- a/xos/genx/xprotos/core/serviceattribute.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ServiceAttribute (PlCoreBase){
-     required string name = 1 [help_text = "Attribute Name", max_length = 128, null = False, db_index = False, blank = False];
-     required string value = 2 [help_text = "Attribute Value", null = False, db_index = False, blank = False];
-     required manytoone service->Service:serviceattributes = 3 [help_text = "The Service this attribute is associated with", null = False, db_index = True, blank = False];
-}
diff --git a/xos/genx/xprotos/core/serviceclass.xproto b/xos/genx/xprotos/core/serviceclass.xproto
deleted file mode 100644
index 9f1e4cf..0000000
--- a/xos/genx/xprotos/core/serviceclass.xproto
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-message ServiceClass (PlCoreBase){
-     required string name = 1 [db_index = False, max_length = 32, null = False, content_type = "stripped", blank = False];
-     required string description = 2 [db_index = False, max_length = 255, null = False, content_type = "stripped", blank = False];
-     required int32 commitment = 3 [default = 365, null = False, db_index = False, blank = False];
-     required int32 membershipFee = 4 [default = 0, null = False, db_index = False, blank = False];
-     required int32 membershipFeeMonths = 5 [default = 12, null = False, db_index = False, blank = False];
-     required bool upgradeRequiresApproval = 6 [default = False, null = False, db_index = False, blank = True];
-     required manytomany upgradeFrom->ServiceClass/ServiceClass_upgradeFrom:upgradeFrom_rel_+ = 7 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/servicecontroller.xproto b/xos/genx/xprotos/core/servicecontroller.xproto
deleted file mode 100644
index aa4baaa..0000000
--- a/xos/genx/xprotos/core/servicecontroller.xproto
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-message ServiceController (LoadableModule){
-     optional string synchronizer_run = 1 [max_length = 1024, content_type = "stripped", blank = True, help_text = "synchronizer run command", null = True, db_index = False];
-     optional string synchronizer_config = 2 [max_length = 1024, content_type = "stripped", blank = True, help_text = "synchronizer config file", null = True, db_index = False];
-     optional string image = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "docker image name", null = True, db_index = False];
-     required bool no_start = 4 [help_text = "Do not start the Synchronizer", default = False, null = False, db_index = False, blank = True];
-     required bool no_build = 5 [help_text = "Do not build the Synchronizer container", default = False, null = False, db_index = False, blank = True];
-     required bool no_deploy = 6 [help_text = "Do not add synchronizer container to onboarding-docker-compose", default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/servicedependency.xproto b/xos/genx/xprotos/core/servicedependency.xproto
deleted file mode 100644
index 09248fe..0000000
--- a/xos/genx/xprotos/core/servicedependency.xproto
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-message ServiceDependency (Tenant){
-}
diff --git a/xos/genx/xprotos/core/servicemonitoringagentinfo.xproto b/xos/genx/xprotos/core/servicemonitoringagentinfo.xproto
deleted file mode 100644
index 4a4e466..0000000
--- a/xos/genx/xprotos/core/servicemonitoringagentinfo.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ServiceMonitoringAgentInfo (PlCoreBase){
-     required string name = 1 [help_text = "Monitoring Agent Name", max_length = 128, null = False, db_index = False, blank = False];
-     optional manytoone service->Service:servicemonitoringagents = 2 [help_text = "The Service this attribute is associated with", null = True, db_index = True, blank = True];
-     required string target_uri = 3 [help_text = "Monitoring collector URI to be used by agents to publish the data", null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/serviceprivilege.xproto b/xos/genx/xprotos/core/serviceprivilege.xproto
deleted file mode 100644
index f88acef..0000000
--- a/xos/genx/xprotos/core/serviceprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message ServicePrivilege (PlCoreBase){
-     required manytoone user->User:serviceprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone service->Service:serviceprivileges = 2 [db_index = True, null = False, blank = False];
-     required manytoone role->ServiceRole:serviceprivileges = 3 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/serviceresource.xproto b/xos/genx/xprotos/core/serviceresource.xproto
deleted file mode 100644
index 46cb5c4..0000000
--- a/xos/genx/xprotos/core/serviceresource.xproto
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-message ServiceResource (PlCoreBase){
-     required manytoone serviceClass->ServiceClass:serviceresources = 1 [db_index = True, null = False, blank = False];
-     required string name = 2 [db_index = False, max_length = 32, null = False, content_type = "stripped", blank = False];
-     required int32 maxUnitsDeployment = 3 [default = 1, null = False, db_index = False, blank = False];
-     required int32 maxUnitsNode = 4 [default = 1, null = False, db_index = False, blank = False];
-     required int32 maxDuration = 5 [default = 1, null = False, db_index = False, blank = False];
-     required int32 bucketInRate = 6 [default = 0, null = False, db_index = False, blank = False];
-     required int32 bucketMaxSize = 7 [default = 0, null = False, db_index = False, blank = False];
-     required int32 cost = 8 [default = 0, null = False, db_index = False, blank = False];
-     required bool calendarReservable = 9 [default = True, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/servicerole.xproto b/xos/genx/xprotos/core/servicerole.xproto
deleted file mode 100644
index 3661df4..0000000
--- a/xos/genx/xprotos/core/servicerole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message ServiceRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'),)", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/site.xproto b/xos/genx/xprotos/core/site.xproto
deleted file mode 100644
index 550be4f..0000000
--- a/xos/genx/xprotos/core/site.xproto
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-message Site (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name for this Site", null = False, db_index = False];
-     optional string site_url = 2 [max_length = 512, content_type = "url", blank = True, help_text = "Site's Home URL Page", null = True, db_index = False];
-     required bool enabled = 3 [help_text = "Status for this Site", default = True, null = False, db_index = False, blank = True];
-     required bool hosts_nodes = 4 [help_text = "Indicates whether or not the site host nodes", default = True, null = False, db_index = False, blank = True];
-     required bool hosts_users = 5 [help_text = "Indicates whether or not the site manages user accounts", default = True, null = False, db_index = False, blank = True];
-     optional float longitude = 6 [db_index = False, null = True, blank = True];
-     optional float latitude = 7 [db_index = False, null = True, blank = True];
-     required string login_base = 8 [max_length = 50, content_type = "stripped", blank = False, help_text = "Prefix for Slices associated with this Site", null = False, db_index = False];
-     required bool is_public = 9 [help_text = "Indicates the visibility of this site to other members", default = True, null = False, db_index = False, blank = True];
-     required string abbreviated_name = 10 [db_index = False, max_length = 80, null = False, content_type = "stripped", blank = False];
-     required manytomany deployments->Deployment/DashboardView_deployments:sites = 11 [help_text = "Select which sites are allowed to host nodes in this deployment", null = False, db_index = False, blank = True];
-     required manytomany tags->Tag = 12 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/sitecredential.xproto b/xos/genx/xprotos/core/sitecredential.xproto
deleted file mode 100644
index f6a3fec..0000000
--- a/xos/genx/xprotos/core/sitecredential.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message SiteCredential (PlCoreBase){
-     required manytoone site->Site:sitecredentials = 1 [help_text = "The User this credential is associated with", null = False, db_index = True, blank = False];
-     required string name = 2 [help_text = "The credential type, e.g. ec2", max_length = 128, null = False, db_index = True, blank = False];
-     required string key_id = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "The backend id of this credential", null = False, db_index = False];
-     required string enc_value = 4 [help_text = "The key value of this credential", max_length = 1024, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/sitedeployment.xproto b/xos/genx/xprotos/core/sitedeployment.xproto
deleted file mode 100644
index ae12aa1..0000000
--- a/xos/genx/xprotos/core/sitedeployment.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message SiteDeployment (PlCoreBase){
-     required manytoone site->Site:sitedeployments = 1 [db_index = True, null = False, blank = False];
-     required manytoone deployment->Deployment:sitedeployments = 2 [db_index = True, null = False, blank = False];
-     optional manytoone controller->Controller:sitedeployments = 3 [db_index = True, null = True, blank = True];
-     optional string availability_zone = 4 [max_length = 200, content_type = "stripped", blank = True, help_text = "OpenStack availability zone", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/siteprivilege.xproto b/xos/genx/xprotos/core/siteprivilege.xproto
deleted file mode 100644
index c63677a..0000000
--- a/xos/genx/xprotos/core/siteprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message SitePrivilege (PlCoreBase){
-     required manytoone user->User:siteprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone site->Site:siteprivileges = 2 [db_index = True, null = False, blank = False];
-     required manytoone role->SiteRole:siteprivileges = 3 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/siterole.xproto b/xos/genx/xprotos/core/siterole.xproto
deleted file mode 100644
index a42ef5c..0000000
--- a/xos/genx/xprotos/core/siterole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message SiteRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'), ('pi', 'PI'), ('tech', 'Tech'), ('billing', 'Billing'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/slice.xproto b/xos/genx/xprotos/core/slice.xproto
deleted file mode 100644
index 5b1acaa..0000000
--- a/xos/genx/xprotos/core/slice.xproto
+++ /dev/null
@@ -1,20 +0,0 @@
-message Slice (PlCoreBase){
-     required string name = 1 [max_length = 80, content_type = "stripped", blank = False, help_text = "The Name of the Slice", null = False, db_index = False];
-     required bool enabled = 2 [help_text = "Status for this Slice", default = True, null = False, db_index = False, blank = True];
-     required bool omf_friendly = 3 [default = False, null = False, db_index = False, blank = True];
-     required string description = 4 [help_text = "High level description of the slice and expected activities", max_length = 1024, null = False, db_index = False, blank = True];
-     required string slice_url = 5 [db_index = False, max_length = 512, null = False, content_type = "url", blank = True];
-     required manytoone site->Site:slices = 6 [help_text = "The Site this Slice belongs to", null = False, db_index = True, blank = False];
-     required int32 max_instances = 7 [default = 10, null = False, db_index = False, blank = False];
-     optional manytoone service->Service:slices = 8 [db_index = True, null = True, blank = True];
-     optional string network = 9 [blank = True, max_length = 256, null = True, db_index = False, choices = "((None, 'Default'), ('host', 'Host'), ('bridged', 'Bridged'), ('noauto', 'No Automatic Networks'))"];
-     optional string exposed_ports = 10 [db_index = False, max_length = 256, null = True, blank = True];
-     optional manytoone serviceClass->ServiceClass:slices = 11 [db_index = True, null = True, blank = True];
-     optional manytoone creator->User:slices = 12 [db_index = True, null = True, blank = True];
-     optional manytoone default_flavor->Flavor:slices = 13 [db_index = True, null = True, blank = True];
-     optional manytoone default_image->Image:slices = 14 [db_index = True, null = True, blank = True];
-     optional manytoone default_node->Node:slices = 15 [db_index = True, null = True, blank = True];
-     optional string mount_data_sets = 16 [default = "GenBank", max_length = 256, content_type = "stripped", blank = True, null = True, db_index = False];
-     required string default_isolation = 17 [default = "vm", choices = "(('vm', 'Virtual Machine'), ('container', 'Container'), ('container_vm', 'Container In VM'))", max_length = 30, blank = False, null = False, db_index = False];
-     required manytomany tags->Tag = 18 [db_index = False, null = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/slicecredential.xproto b/xos/genx/xprotos/core/slicecredential.xproto
deleted file mode 100644
index 3ae9ed9..0000000
--- a/xos/genx/xprotos/core/slicecredential.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message SliceCredential (PlCoreBase){
-     required manytoone slice->Slice:slicecredentials = 1 [help_text = "The User this credential is associated with", null = False, db_index = True, blank = False];
-     required string name = 2 [help_text = "The credential type, e.g. ec2", max_length = 128, null = False, db_index = True, blank = False];
-     required string key_id = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "The backend id of this credential", null = False, db_index = False];
-     required string enc_value = 4 [help_text = "The key value of this credential", max_length = 1024, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/sliceprivilege.xproto b/xos/genx/xprotos/core/sliceprivilege.xproto
deleted file mode 100644
index 587f423..0000000
--- a/xos/genx/xprotos/core/sliceprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message SlicePrivilege (PlCoreBase){
-     required manytoone user->User:sliceprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone slice->Slice:sliceprivileges = 2 [db_index = True, null = False, blank = False];
-     required manytoone role->SliceRole:sliceprivileges = 3 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/slicerole.xproto b/xos/genx/xprotos/core/slicerole.xproto
deleted file mode 100644
index 6396518..0000000
--- a/xos/genx/xprotos/core/slicerole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message SliceRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'), ('default', 'Default'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/slicetag.xproto b/xos/genx/xprotos/core/slicetag.xproto
deleted file mode 100644
index a2cac93..0000000
--- a/xos/genx/xprotos/core/slicetag.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message SliceTag (PlCoreBase){
-     required manytoone slice->Slice:slicetags = 1 [db_index = True, null = False, blank = False];
-     required string name = 2 [choices = "(('privatekey', 'Private Key'), ('publickey', 'Public Key'))", max_length = 30, content_type = "stripped", blank = False, help_text = "The name of this tag", null = False, db_index = False];
-     required string value = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "The value of this tag", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/tag.xproto b/xos/genx/xprotos/core/tag.xproto
deleted file mode 100644
index 45662a8..0000000
--- a/xos/genx/xprotos/core/tag.xproto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-message Tag (PlCoreBase){
-     required manytoone service->Service:tags = 1 [help_text = "The Service this Tag is associated with", null = False, db_index = True, blank = False];
-     required string name = 2 [help_text = "The name of this tag", max_length = 128, null = False, db_index = True, blank = False];
-     required string value = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "The value of this tag", null = False, db_index = False];
-     required manytoone content_type->ContentType:tag = 4 [db_index = True, null = False, blank = False];
-     required uint32 object_id = 5 [db_index = False, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/tenant.xproto b/xos/genx/xprotos/core/tenant.xproto
deleted file mode 100644
index 91de112..0000000
--- a/xos/genx/xprotos/core/tenant.xproto
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-message Tenant (PlCoreBase,AttributeMixin){
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/tenantattribute.xproto b/xos/genx/xprotos/core/tenantattribute.xproto
deleted file mode 100644
index f9a3abe..0000000
--- a/xos/genx/xprotos/core/tenantattribute.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message TenantAttribute (PlCoreBase){
-     required string name = 1 [help_text = "Attribute Name", max_length = 128, null = False, db_index = False, blank = False];
-     required string value = 2 [help_text = "Attribute Value", null = False, db_index = False, blank = False];
-     required manytoone tenant->Tenant:tenantattributes = 3 [help_text = "The Tenant this attribute is associated with", null = False, db_index = True, blank = False];
-}
diff --git a/xos/genx/xprotos/core/tenantprivilege.xproto b/xos/genx/xprotos/core/tenantprivilege.xproto
deleted file mode 100644
index 9d90981..0000000
--- a/xos/genx/xprotos/core/tenantprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message TenantPrivilege (PlCoreBase){
-     required manytoone user->User:tenantprivileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone tenant->Tenant:tenantprivileges = 2 [db_index = True, null = False, blank = False];
-     required manytoone role->TenantRole:tenantprivileges = 3 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/tenantrole.xproto b/xos/genx/xprotos/core/tenantrole.xproto
deleted file mode 100644
index 646809e..0000000
--- a/xos/genx/xprotos/core/tenantrole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message TenantRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'), ('access', 'Access'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/tenantroot.xproto b/xos/genx/xprotos/core/tenantroot.xproto
deleted file mode 100644
index 3c01492..0000000
--- a/xos/genx/xprotos/core/tenantroot.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message TenantRoot (PlCoreBase,AttributeMixin){
-     required string kind = 1 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     optional string name = 2 [max_length = 255, content_type = "stripped", blank = True, help_text = "name", null = True, db_index = False];
-     optional string service_specific_attribute = 3 [db_index = False, null = True, blank = True];
-     optional string service_specific_id = 4 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-}
diff --git a/xos/genx/xprotos/core/tenantrootprivilege.xproto b/xos/genx/xprotos/core/tenantrootprivilege.xproto
deleted file mode 100644
index cf86119..0000000
--- a/xos/genx/xprotos/core/tenantrootprivilege.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message TenantRootPrivilege (PlCoreBase){
-     required manytoone user->User:tenant_root_privileges = 1 [db_index = True, null = False, blank = False];
-     required manytoone tenant_root->TenantRoot:tenant_root_privileges = 2 [db_index = True, null = False, blank = False];
-     required manytoone role->TenantRootRole:tenant_root_privileges = 3 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/tenantrootrole.xproto b/xos/genx/xprotos/core/tenantrootrole.xproto
deleted file mode 100644
index 87346ac..0000000
--- a/xos/genx/xprotos/core/tenantrootrole.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message TenantRootRole (PlCoreBase){
-     required string role = 1 [choices = "(('admin', 'Admin'), ('access', 'Access'))", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/tenantwithcontainer.xproto b/xos/genx/xprotos/core/tenantwithcontainer.xproto
deleted file mode 100644
index 2bef221..0000000
--- a/xos/genx/xprotos/core/tenantwithcontainer.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message TenantWithContainer (Tenant){
-     optional manytoone instance->Instance:+ = 1 [help_text = "Instance used by this Tenant", null = True, db_index = True, blank = True];
-     optional manytoone creator->User:+ = 2 [help_text = "Creator of this Tenant", null = True, db_index = True, blank = True];
-     optional string external_hostname = 3 [max_length = 30, content_type = "stripped", blank = True, help_text = "External host name", null = True, db_index = False];
-     optional string external_container = 4 [max_length = 30, content_type = "stripped", blank = True, help_text = "External host name", null = True, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/usableobject.xproto b/xos/genx/xprotos/core/usableobject.xproto
deleted file mode 100644
index 8437318..0000000
--- a/xos/genx/xprotos/core/usableobject.xproto
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-message UsableObject (PlCoreBase){
-     required string name = 1 [db_index = False, max_length = 1024, null = False, content_type = "stripped", blank = False];
-}
diff --git a/xos/genx/xprotos/core/usercredential.xproto b/xos/genx/xprotos/core/usercredential.xproto
deleted file mode 100644
index 22fc83c..0000000
--- a/xos/genx/xprotos/core/usercredential.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message UserCredential (PlCoreBase){
-     required manytoone user->User:usercredentials = 1 [help_text = "The User this credential is associated with", null = False, db_index = True, blank = False];
-     required string name = 2 [help_text = "The credential type, e.g. ec2", max_length = 128, null = False, db_index = True, blank = False];
-     required string key_id = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "The backend id of this credential", null = False, db_index = False];
-     required string enc_value = 4 [help_text = "The key value of this credential", max_length = 1024, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/core/xos.xproto b/xos/genx/xprotos/core/xos.xproto
deleted file mode 100644
index 8f0d60f..0000000
--- a/xos/genx/xprotos/core/xos.xproto
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-message XOS (PlCoreBase){
-     required string name = 1 [default = "XOS", max_length = 200, content_type = "stripped", blank = False, help_text = "Name of XOS", null = False, db_index = False];
-     required int32 ui_port = 2 [help_text = "Port for XOS UI", default = 80, null = False, db_index = False, blank = False];
-     required int32 bootstrap_ui_port = 3 [help_text = "Port for XOS Bootstrap UI", default = 81, null = False, db_index = False, blank = False];
-     required string db_container_name = 4 [default = "xos_db", max_length = 200, content_type = "stripped", blank = False, help_text = "name of XOS db container", null = False, db_index = False];
-     required string redis_container_name = 5 [default = "", max_length = 200, content_type = "stripped", blank = True, help_text = "name of XOS redis container", null = False, db_index = False];
-     required string docker_project_name = 6 [max_length = 200, content_type = "stripped", blank = False, help_text = "docker project name", null = False, db_index = False];
-     required bool enable_build = 7 [help_text = "True if Onboarding Synchronizer should build XOS as necessary", default = True, null = False, db_index = False, blank = True];
-     required bool frontend_only = 8 [help_text = "If True, XOS will not start synchronizer containers", default = False, null = False, db_index = False, blank = True];
-     required string source_ui_image = 9 [default = "xosproject/xos", max_length = 200, content_type = "stripped", blank = False, null = False, db_index = False];
-     optional string extra_hosts = 10 [max_length = 1024, content_type = "stripped", blank = True, help_text = "list of hostname mappings that will be passed to docker-compose", null = True, db_index = False];
-     required bool no_start = 11 [help_text = "Do not start the XOS UI inside of the UI docker container", default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/xoscomponent.xproto b/xos/genx/xprotos/core/xoscomponent.xproto
deleted file mode 100644
index 057529a..0000000
--- a/xos/genx/xprotos/core/xoscomponent.xproto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-message XOSComponent (LoadableModule){
-     required string image = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "docker image name", null = False, db_index = False];
-     optional string command = 2 [max_length = 1024, content_type = "stripped", blank = True, help_text = "docker run command", null = True, db_index = False];
-     optional string ports = 3 [max_length = 200, content_type = "stripped", blank = True, help_text = "port binding", null = True, db_index = False];
-     optional string extra = 4 [max_length = 200, content_type = "stripped", blank = True, help_text = "extra information needed by containers", null = True, db_index = False];
-     required bool no_start = 5 [help_text = "Do not start the Component", default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/xoscomponentlink.xproto b/xos/genx/xprotos/core/xoscomponentlink.xproto
deleted file mode 100644
index 5d95bf0..0000000
--- a/xos/genx/xprotos/core/xoscomponentlink.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message XOSComponentLink (PlCoreBase){
-     required manytoone component->XOSComponent:links = 1 [help_text = "The Component object for this Link", null = False, db_index = True, blank = False];
-     required string container = 2 [max_length = 200, content_type = "stripped", blank = False, help_text = "container to link", null = False, db_index = False];
-     required string alias = 3 [max_length = 200, content_type = "stripped", blank = False, help_text = "alias for the link", null = False, db_index = False];
-     required string kind = 4 [default = "internal", choices = "(('internal', 'Internal'), ('external', 'External'))", max_length = 20, blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/xoscomponentvolume.xproto b/xos/genx/xprotos/core/xoscomponentvolume.xproto
deleted file mode 100644
index c1f7e91..0000000
--- a/xos/genx/xprotos/core/xoscomponentvolume.xproto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-message XOSComponentVolume (PlCoreBase){
-     required manytoone component->XOSComponent:volumes = 1 [help_text = "The Component object for this Volume", null = False, db_index = True, blank = False];
-     required string name = 2 [max_length = 300, content_type = "stripped", blank = False, help_text = "Volume Name", null = False, db_index = False];
-     required string container_path = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "Path of Volume in Container", null = False, db_index = False];
-     required string host_path = 4 [max_length = 1024, content_type = "stripped", blank = False, help_text = "Path of Volume in Host", null = False, db_index = False];
-     required bool read_only = 5 [help_text = "True if mount read-only", default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/core/xoscomponentvolumecontainer.xproto b/xos/genx/xprotos/core/xoscomponentvolumecontainer.xproto
deleted file mode 100644
index a8c8223..0000000
--- a/xos/genx/xprotos/core/xoscomponentvolumecontainer.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message XOSComponentVolumeContainer (PlCoreBase){
-     required manytoone component->XOSComponent:volumecontainers = 1 [help_text = "The Component object for this VolumeContainer", null = False, db_index = True, blank = False];
-     required string name = 2 [max_length = 300, content_type = "stripped", blank = False, help_text = "Volume Name", null = False, db_index = False];
-     required string container = 3 [max_length = 300, content_type = "stripped", blank = False, help_text = "Volume Name", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/xosguiextension.xproto b/xos/genx/xprotos/core/xosguiextension.xproto
deleted file mode 100644
index 774de4e..0000000
--- a/xos/genx/xprotos/core/xosguiextension.xproto
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-message XOSGuiExtension (PlCoreBase){
-     required string name = 1 [max_length = 200, content_type = "stripped", blank = False, help_text = "Name of the GUI Extensions", null = False, db_index = False];
-     required string files = 2 [max_length = 1024, content_type = "stripped", blank = False, help_text = "List of comma separated file composing the view", null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/core/xosvolume.xproto b/xos/genx/xprotos/core/xosvolume.xproto
deleted file mode 100644
index 2da83d3..0000000
--- a/xos/genx/xprotos/core/xosvolume.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message XOSVolume (PlCoreBase){
-     required manytoone xos->XOS:volumes = 1 [help_text = "The XOS object for this Volume", null = False, db_index = True, blank = False];
-     required string container_path = 2 [max_length = 1024, content_type = "stripped", blank = False, help_text = "Path of Volume in Container", null = False, db_index = False];
-     required string host_path = 3 [max_length = 1024, content_type = "stripped", blank = False, help_text = "Path of Volume in Host", null = False, db_index = False];
-     required bool read_only = 4 [help_text = "True if mount read-only", default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.exampleservice/exampleservice.xproto b/xos/genx/xprotos/services.exampleservice/exampleservice.xproto
deleted file mode 100644
index 373022c..0000000
--- a/xos/genx/xprotos/services.exampleservice/exampleservice.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message ExampleService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     required string service_message = 14 [help_text = "Service Message to Display", max_length = 254, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/services.exampleservice/exampletenant.xproto b/xos/genx/xprotos/services.exampleservice/exampletenant.xproto
deleted file mode 100644
index 85404ee..0000000
--- a/xos/genx/xprotos/services.exampleservice/exampletenant.xproto
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-message ExampleTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional manytoone instance->Instance:+ = 12 [help_text = "Instance used by this Tenant", null = True, db_index = True, blank = True];
-     optional manytoone creator->User:+ = 13 [help_text = "Creator of this Tenant", null = True, db_index = True, blank = True];
-     optional string external_hostname = 14 [max_length = 30, content_type = "stripped", blank = True, help_text = "External host name", null = True, db_index = False];
-     optional string external_container = 15 [max_length = 30, content_type = "stripped", blank = True, help_text = "External host name", null = True, db_index = False];
-     required string tenant_message = 16 [help_text = "Tenant Message to Display", max_length = 254, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/services.fabric/fabricservice.xproto b/xos/genx/xprotos/services.fabric/fabricservice.xproto
deleted file mode 100644
index 662d7ea..0000000
--- a/xos/genx/xprotos/services.fabric/fabricservice.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message FabricService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     required bool autoconfig = 14 [help_text = "Autoconfigure the fabric", default = True, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.onos/onosapp.xproto b/xos/genx/xprotos/services.onos/onosapp.xproto
deleted file mode 100644
index 91af3c8..0000000
--- a/xos/genx/xprotos/services.onos/onosapp.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message ONOSApp {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string install_dependencies = 12 [db_index = False, null = True, blank = True];
-     optional string dependencies = 13 [db_index = False, null = True, blank = True];
-     optional manytoone creator->User:onos_apps = 14 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.onos/onosservice.xproto b/xos/genx/xprotos/services.onos/onosservice.xproto
deleted file mode 100644
index 0de950e..0000000
--- a/xos/genx/xprotos/services.onos/onosservice.xproto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-message ONOSService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     optional string rest_hostname = 14 [db_index = False, max_length = 255, null = True, content_type = "stripped", blank = True];
-     required int32 rest_port = 15 [default = 8181, null = False, db_index = False, blank = False];
-     required bool no_container = 16 [default = False, null = False, db_index = False, blank = True];
-     optional string node_key = 17 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/accessagent.xproto b/xos/genx/xprotos/services.volt/accessagent.xproto
deleted file mode 100644
index d97622a..0000000
--- a/xos/genx/xprotos/services.volt/accessagent.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message AccessAgent {
-     required string name = 1 [help_text = "name of agent", max_length = 254, null = False, db_index = False, blank = False];
-     required manytoone volt_service->VOLTService:access_agents = 2 [db_index = True, null = False, blank = False];
-     optional string mac = 3 [help_text = "MAC Address or Access Agent", max_length = 32, null = True, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/accessdevice.xproto b/xos/genx/xprotos/services.volt/accessdevice.xproto
deleted file mode 100644
index 73242dd..0000000
--- a/xos/genx/xprotos/services.volt/accessdevice.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message AccessDevice {
-     required manytoone volt_device->VOLTDevice:access_devices = 1 [db_index = True, null = False, blank = False];
-     optional int32 uplink = 2 [db_index = False, null = True, blank = True];
-     optional int32 vlan = 3 [db_index = False, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/agentportmapping.xproto b/xos/genx/xprotos/services.volt/agentportmapping.xproto
deleted file mode 100644
index f62ed9a..0000000
--- a/xos/genx/xprotos/services.volt/agentportmapping.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message AgentPortMapping {
-     required manytoone access_agent->AccessAgent:port_mappings = 1 [db_index = True, null = False, blank = False];
-     optional string mac = 2 [help_text = "MAC Address", max_length = 32, null = True, db_index = False, blank = True];
-     optional string port = 3 [help_text = "Openflow port ID", max_length = 32, null = True, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/cordsubscriberroot.xproto b/xos/genx/xprotos/services.volt/cordsubscriberroot.xproto
deleted file mode 100644
index b344f62..0000000
--- a/xos/genx/xprotos/services.volt/cordsubscriberroot.xproto
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-message CordSubscriberRoot {
-     required string kind = 1 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     optional string name = 2 [max_length = 255, content_type = "stripped", blank = True, help_text = "name", null = True, db_index = False];
-     optional string service_specific_attribute = 3 [db_index = False, null = True, blank = True];
-     optional string service_specific_id = 4 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     required bool firewall_enable = 5 [default = False, null = False, db_index = False, blank = True];
-     optional string firewall_rules = 6 [default = "accept all anywhere anywhere", null = True, db_index = False, blank = True];
-     required bool url_filter_enable = 7 [default = False, null = False, db_index = False, blank = True];
-     optional string url_filter_rules = 8 [default = "allow all", null = True, db_index = False, blank = True];
-     required string url_filter_level = 9 [default = "PG", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required bool cdn_enable = 10 [default = False, null = False, db_index = False, blank = True];
-     required bool is_demo_user = 11 [default = False, null = False, db_index = False, blank = True];
-     required int32 uplink_speed = 12 [default = 1000000000, null = False, db_index = False, blank = False];
-     required int32 downlink_speed = 13 [default = 1000000000, null = False, db_index = False, blank = False];
-     required bool enable_uverse = 14 [default = True, null = False, db_index = False, blank = True];
-     required string status = 15 [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];
-}
diff --git a/xos/genx/xprotos/services.volt/voltdevice.xproto b/xos/genx/xprotos/services.volt/voltdevice.xproto
deleted file mode 100644
index ea15204..0000000
--- a/xos/genx/xprotos/services.volt/voltdevice.xproto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-message VOLTDevice {
-     required string name = 1 [help_text = "name of device", max_length = 254, null = False, db_index = False, blank = False];
-     required manytoone volt_service->VOLTService:volt_devices = 2 [db_index = True, null = False, blank = False];
-     optional string openflow_id = 3 [help_text = "OpenFlow ID", max_length = 254, null = True, db_index = False, blank = True];
-     optional string driver = 4 [help_text = "driver", max_length = 254, null = True, db_index = False, blank = True];
-     optional manytoone access_agent->AccessAgent:volt_devices = 5 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/voltservice.xproto b/xos/genx/xprotos/services.volt/voltservice.xproto
deleted file mode 100644
index 51a362f..0000000
--- a/xos/genx/xprotos/services.volt/voltservice.xproto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-message VOLTService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/volttenant.xproto b/xos/genx/xprotos/services.volt/volttenant.xproto
deleted file mode 100644
index 543f132..0000000
--- a/xos/genx/xprotos/services.volt/volttenant.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message VOLTTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional int32 s_tag = 12 [help_text = "s-tag", null = True, db_index = False, blank = True];
-     optional int32 c_tag = 13 [help_text = "c-tag", null = True, db_index = False, blank = True];
-     optional manytoone creator->User:created_volts = 14 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.volt/vrouterservice.xproto b/xos/genx/xprotos/services.volt/vrouterservice.xproto
deleted file mode 100644
index ce77671..0000000
--- a/xos/genx/xprotos/services.volt/vrouterservice.xproto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-message VRouterService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     optional string rest_hostname = 14 [db_index = False, max_length = 255, null = True, content_type = "stripped", blank = True];
-     required int32 rest_port = 15 [default = 8181, null = False, db_index = False, blank = False];
-     required string rest_user = 16 [default = "onos", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string rest_pass = 17 [default = "rocks", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/services.volt/vroutertenant.xproto b/xos/genx/xprotos/services.volt/vroutertenant.xproto
deleted file mode 100644
index 2189d51..0000000
--- a/xos/genx/xprotos/services.volt/vroutertenant.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message VRouterTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string public_ip = 12 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string public_mac = 13 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional manytoone address_pool->AddressPool:vrouter_tenants = 14 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vrouterapp.xproto b/xos/genx/xprotos/services.vrouter/vrouterapp.xproto
deleted file mode 100644
index d1d9ca8..0000000
--- a/xos/genx/xprotos/services.vrouter/vrouterapp.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message VRouterApp {
-     required manytoone vrouter_service->VRouterService:apps = 1 [db_index = True, null = False, blank = False];
-     required string name = 2 [help_text = "application name", max_length = 50, null = False, db_index = False, blank = False];
-     required string control_plane_connect_point = 3 [help_text = "port identifier in ONOS", max_length = 21, null = False, db_index = False, blank = False];
-     required bool ospf_enabled = 4 [help_text = "ospf enabled", default = True, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vrouterdevice.xproto b/xos/genx/xprotos/services.vrouter/vrouterdevice.xproto
deleted file mode 100644
index d4b1fcd..0000000
--- a/xos/genx/xprotos/services.vrouter/vrouterdevice.xproto
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-message VRouterDevice {
-     optional string name = 1 [help_text = "device friendly name", max_length = 20, null = True, db_index = False, blank = True];
-     required string openflow_id = 2 [help_text = "device identifier in ONOS", max_length = 20, null = False, db_index = False, blank = False];
-     required string config_key = 3 [default = "basic", max_length = 32, blank = False, help_text = "configuration key", null = False, db_index = False];
-     required string driver = 4 [help_text = "driver type", max_length = 32, null = False, db_index = False, blank = False];
-     required manytoone vrouter_service->VRouterService:devices = 5 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vrouterinterface.xproto b/xos/genx/xprotos/services.vrouter/vrouterinterface.xproto
deleted file mode 100644
index 54e9786..0000000
--- a/xos/genx/xprotos/services.vrouter/vrouterinterface.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message VRouterInterface {
-     required manytoone vrouter_port->VRouterPort:interfaces = 1 [db_index = True, null = False, blank = False];
-     required string name = 2 [help_text = "interface name", max_length = 10, null = False, db_index = False, blank = False];
-     required string mac = 3 [help_text = "interface mac", max_length = 17, null = False, db_index = False, blank = False];
-     optional string vlan = 4 [help_text = "interface vlan id", max_length = 10, null = True, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vrouterip.xproto b/xos/genx/xprotos/services.vrouter/vrouterip.xproto
deleted file mode 100644
index 2e8536e..0000000
--- a/xos/genx/xprotos/services.vrouter/vrouterip.xproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-message VRouterIp {
-     optional string name = 1 [help_text = "ip friendly name", max_length = 20, null = True, db_index = False, blank = True];
-     required manytoone vrouter_interface->VRouterInterface:ips = 2 [db_index = True, null = False, blank = False];
-     required string ip = 3 [help_text = "interface ips", max_length = 19, null = False, db_index = False, blank = False];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vrouterport.xproto b/xos/genx/xprotos/services.vrouter/vrouterport.xproto
deleted file mode 100644
index 038e3ce..0000000
--- a/xos/genx/xprotos/services.vrouter/vrouterport.xproto
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-message VRouterPort {
-     optional string name = 1 [help_text = "port friendly name", max_length = 20, null = True, db_index = False, blank = True];
-     required string openflow_id = 2 [help_text = "port identifier in ONOS", max_length = 21, null = False, db_index = False, blank = False];
-     required manytoone vrouter_device->VRouterDevice:ports = 3 [db_index = True, null = False, blank = False];
-     required manytoone vrouter_service->VRouterService:device_ports = 4 [db_index = True, null = False, blank = False];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vrouterservice.xproto b/xos/genx/xprotos/services.vrouter/vrouterservice.xproto
deleted file mode 100644
index ce77671..0000000
--- a/xos/genx/xprotos/services.vrouter/vrouterservice.xproto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-message VRouterService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     optional string rest_hostname = 14 [db_index = False, max_length = 255, null = True, content_type = "stripped", blank = True];
-     required int32 rest_port = 15 [default = 8181, null = False, db_index = False, blank = False];
-     required string rest_user = 16 [default = "onos", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string rest_pass = 17 [default = "rocks", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/services.vrouter/vroutertenant.xproto b/xos/genx/xprotos/services.vrouter/vroutertenant.xproto
deleted file mode 100644
index 2189d51..0000000
--- a/xos/genx/xprotos/services.vrouter/vroutertenant.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message VRouterTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string public_ip = 12 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string public_mac = 13 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional manytoone address_pool->AddressPool:vrouter_tenants = 14 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vsg/vrouterservice.xproto b/xos/genx/xprotos/services.vsg/vrouterservice.xproto
deleted file mode 100644
index ce77671..0000000
--- a/xos/genx/xprotos/services.vsg/vrouterservice.xproto
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-message VRouterService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     optional string rest_hostname = 14 [db_index = False, max_length = 255, null = True, content_type = "stripped", blank = True];
-     required int32 rest_port = 15 [default = 8181, null = False, db_index = False, blank = False];
-     required string rest_user = 16 [default = "onos", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string rest_pass = 17 [default = "rocks", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/services.vsg/vroutertenant.xproto b/xos/genx/xprotos/services.vsg/vroutertenant.xproto
deleted file mode 100644
index 2189d51..0000000
--- a/xos/genx/xprotos/services.vsg/vroutertenant.xproto
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-message VRouterTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional string public_ip = 12 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string public_mac = 13 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional manytoone address_pool->AddressPool:vrouter_tenants = 14 [db_index = True, null = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vsg/vsgservice.xproto b/xos/genx/xprotos/services.vsg/vsgservice.xproto
deleted file mode 100644
index 77d5fc9..0000000
--- a/xos/genx/xprotos/services.vsg/vsgservice.xproto
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-message VSGService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     optional string url_filter_kind = 14 [choices = "((None, 'None'), ('safebrowsing', 'Safe Browsing'), ('answerx', 'AnswerX'))", max_length = 30, content_type = "stripped", blank = True, null = True, db_index = False];
-     required string dns_servers = 15 [default = "8.8.8.8", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     optional string node_label = 16 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     required string docker_image_name = 17 [default = "docker.io/xosproject/vsg", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     required bool docker_insecure_registry = 18 [default = False, null = False, db_index = False, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vsg/vsgtenant.xproto b/xos/genx/xprotos/services.vsg/vsgtenant.xproto
deleted file mode 100644
index b89ef82..0000000
--- a/xos/genx/xprotos/services.vsg/vsgtenant.xproto
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-message VSGTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     optional manytoone instance->Instance:+ = 12 [help_text = "Instance used by this Tenant", null = True, db_index = True, blank = True];
-     optional manytoone creator->User:+ = 13 [help_text = "Creator of this Tenant", null = True, db_index = True, blank = True];
-     optional string external_hostname = 14 [max_length = 30, content_type = "stripped", blank = True, help_text = "External host name", null = True, db_index = False];
-     optional string external_container = 15 [max_length = 30, content_type = "stripped", blank = True, help_text = "External host name", null = True, db_index = False];
-     optional string last_ansible_hash = 16 [db_index = False, max_length = 128, null = True, content_type = "stripped", blank = True];
-}
diff --git a/xos/genx/xprotos/services.vtn/vtnservice.xproto b/xos/genx/xprotos/services.vtn/vtnservice.xproto
deleted file mode 100644
index 8510583..0000000
--- a/xos/genx/xprotos/services.vtn/vtnservice.xproto
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-message VTNService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-     required string privateGatewayMac = 14 [default = "00:00:00:00:00:01", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string localManagementIp = 15 [default = "172.27.0.1/24", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required int32 ovsdbPort = 16 [default = 6641, null = False, db_index = False, blank = False];
-     required int32 sshPort = 17 [default = 22, null = False, db_index = False, blank = False];
-     required string sshUser = 18 [default = "root", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string sshKeyFile = 19 [default = "/root/node_key", max_length = 1024, content_type = "stripped", blank = False, null = False, db_index = False];
-     required int32 mgmtSubnetBits = 20 [default = 24, null = False, db_index = False, blank = False];
-     required string xosEndpoint = 21 [default = "http://xos/", max_length = 1024, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string xosUser = 22 [default = "padmin@vicci.org", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     required string xosPassword = 23 [default = "letmein", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-     required int32 vtnAPIVersion = 24 [default = 1, null = False, db_index = False, blank = False];
-     required string controllerPort = 25 [default = "onos-cord:6653", max_length = 255, content_type = "stripped", blank = False, null = False, db_index = False];
-}
diff --git a/xos/genx/xprotos/services.vtr/cordsubscriberroot.xproto b/xos/genx/xprotos/services.vtr/cordsubscriberroot.xproto
deleted file mode 100644
index b344f62..0000000
--- a/xos/genx/xprotos/services.vtr/cordsubscriberroot.xproto
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-message CordSubscriberRoot {
-     required string kind = 1 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     optional string name = 2 [max_length = 255, content_type = "stripped", blank = True, help_text = "name", null = True, db_index = False];
-     optional string service_specific_attribute = 3 [db_index = False, null = True, blank = True];
-     optional string service_specific_id = 4 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     required bool firewall_enable = 5 [default = False, null = False, db_index = False, blank = True];
-     optional string firewall_rules = 6 [default = "accept all anywhere anywhere", null = True, db_index = False, blank = True];
-     required bool url_filter_enable = 7 [default = False, null = False, db_index = False, blank = True];
-     optional string url_filter_rules = 8 [default = "allow all", null = True, db_index = False, blank = True];
-     required string url_filter_level = 9 [default = "PG", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required bool cdn_enable = 10 [default = False, null = False, db_index = False, blank = True];
-     required bool is_demo_user = 11 [default = False, null = False, db_index = False, blank = True];
-     required int32 uplink_speed = 12 [default = 1000000000, null = False, db_index = False, blank = False];
-     required int32 downlink_speed = 13 [default = 1000000000, null = False, db_index = False, blank = False];
-     required bool enable_uverse = 14 [default = True, null = False, db_index = False, blank = True];
-     required string status = 15 [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];
-}
diff --git a/xos/genx/xprotos/services.vtr/vtrservice.xproto b/xos/genx/xprotos/services.vtr/vtrservice.xproto
deleted file mode 100644
index 9b218e9..0000000
--- a/xos/genx/xprotos/services.vtr/vtrservice.xproto
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-message VTRService {
-     optional string description = 1 [help_text = "Description of Service", max_length = 254, null = True, db_index = False, blank = True];
-     required bool enabled = 2 [default = True, null = False, db_index = False, blank = True];
-     required string kind = 3 [default = "generic", max_length = 30, content_type = "stripped", blank = False, help_text = "Kind of service", null = False, db_index = False];
-     required string name = 4 [max_length = 30, content_type = "stripped", blank = False, help_text = "Service Name", null = False, db_index = False];
-     optional string versionNumber = 5 [max_length = 30, content_type = "stripped", blank = True, help_text = "Version of Service Definition", null = True, db_index = False];
-     required bool published = 6 [default = True, null = False, db_index = False, blank = True];
-     optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
-     optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
-     optional manytoone controller->ServiceController:services = 13 [help_text = "The Service Controller this Service uses", null = True, db_index = True, blank = True];
-}
diff --git a/xos/genx/xprotos/services.vtr/vtrtenant.xproto b/xos/genx/xprotos/services.vtr/vtrtenant.xproto
deleted file mode 100644
index ed418b7..0000000
--- a/xos/genx/xprotos/services.vtr/vtrtenant.xproto
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-message VTRTenant {
-     optional string name = 1 [db_index = False, max_length = 200, null = True, content_type = "stripped", blank = True];
-     required string kind = 2 [default = "generic", max_length = 30, content_type = "stripped", blank = False, null = False, db_index = False];
-     required manytoone provider_service->Service:provided_tenants = 3 [db_index = True, null = False, blank = False];
-     optional manytoone subscriber_service->Service:subscribed_tenants = 4 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_tenant->Tenant:subscribed_tenants = 5 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_user->User:subscribed_tenants = 6 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_root->TenantRoot:subscribed_tenants = 7 [db_index = True, null = True, blank = True];
-     optional manytoone subscriber_network->Network:subscribed_tenants = 8 [db_index = True, null = True, blank = True];
-     optional string service_specific_id = 9 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
-     optional string service_specific_attribute = 10 [db_index = False, null = True, blank = True];
-     required string connect_method = 11 [default = "na", choices = "(('public', 'Public'), ('private', 'Private'), ('private-unidirectional', 'Private Unidirectional'), ('na', 'Not Applicable'))", max_length = 30, blank = False, null = False, db_index = False];
-     required string test = 12 [choices = "(('ping', 'Ping'), ('traceroute', 'Trace Route'), ('tcpdump', 'Tcp Dump'))", max_length = 30, content_type = "stripped", blank = False, help_text = "type of test", null = False, db_index = False];
-     required string scope = 13 [choices = "(('container', 'Container'), ('vm', 'VM'))", max_length = 30, content_type = "stripped", blank = False, help_text = "scope of test", null = False, db_index = False];
-     optional string argument = 14 [db_index = False, max_length = 40, null = True, content_type = "stripped", blank = True];
-     optional string result = 15 [db_index = False, null = True, blank = True];
-     optional string result_code = 16 [db_index = False, max_length = 32, null = True, content_type = "stripped", blank = True];
-     required manytoone target_type->ContentType:vtrtenant = 17 [db_index = True, null = False, blank = False];
-     required uint32 target_id = 18 [db_index = False, null = False, blank = False];
-}