diff --git a/system/rest.yaml b/system/rest.yaml
index f0e57f9be..3b4c68b61 100644
--- a/system/rest.yaml
+++ b/system/rest.yaml
@@ -762,10 +762,8 @@ endpoints:
       get:
       - name: sensitivityLevelID
         type: "[]string"
-        required: false
         title: Filter by sensitivity level ID
       - name: deleted
-        required: false
         title: Exclude (0, default), include (1) or return only (2) deleted sensitivity levels
         type: uint
 
@@ -775,23 +773,12 @@ endpoints:
     path: "/"
     parameters:
       post:
-      - name: handle
-        type: string
-        required: true
-        title: handle
-      - name: level
-        type: int
-        required: true
-        title: level
-      - name: meta
-        type: types.DalSensitivityLevelMeta
-        parser: types.ParseDalSensitivityLevelMeta
-        required: true
-        title: meta
-
+      - { name: "handle", type: "string",                        required: true }
+      - { name: "level",  type: "int",                           required: true }
+      - { name: "meta",   type: "types.DalSensitivityLevelMeta", required: true,  parser: "types.ParseDalSensitivityLevelMeta" }
   - name: update
     method: PUT
-    title: Update connection details
+    title: Update sensitivity details
     path: "/{sensitivityLevelID}"
     parameters:
       path:
@@ -800,19 +787,9 @@ endpoints:
         required: true
         title: Connection ID
       post:
-      - name: handle
-        type: string
-        required: true
-        title: handle
-      - name: level
-        type: int
-        required: true
-        title: level
-      - name: meta
-        type: types.DalSensitivityLevelMeta
-        parser: types.ParseDalSensitivityLevelMeta
-        required: true
-        title: meta
+      - { name: "handle", type: "string",                        required: true }
+      - { name: "level",  type: "int",                           required: true }
+      - { name: "meta",   type: "types.DalSensitivityLevelMeta", required: true,  parser: "types.ParseDalSensitivityLevelMeta" }
 
   - name: read
     method: GET
@@ -865,18 +842,14 @@ endpoints:
       get:
       - name: connectionID
         type: "[]string"
-        required: false
         title: Filter by connection ID
       - type: string
         name: handle
-        required: false
         title: Search handle to match against connections
       - type: string
         name: type
-        required: false
         title: Search type to match against connections
       - name: deleted
-        required: false
         title: Exclude (0, default), include (1) or return only (2) deleted connections
         type: uint
   - name: create
@@ -885,85 +858,41 @@ endpoints:
     path: "/"
     parameters:
       post:
-      - name: handle
-        type: string
-        required: true
-        title: handle
-      - name: type
-        type: string
-        required: true
-        title: type
-      - name: meta
-        type: types.ConnectionMeta
-        required: true
-        title: meta
-        parser: types.ParseConnectionMeta
-      - name: config
-        type: types.ConnectionConfig
-        required: true
-        title: config
-        parser: types.ParseConnectionConfig
+      - { name: handle, type: "string",                 required: true }
+      - { name: type,   type: "string",                 required: true }
+      - { name: meta,   type: "types.ConnectionMeta",   required: true, parser: "types.ParseConnectionMeta" }
+      - { name: config, type: "types.ConnectionConfig", required: true, parser: "types.ParseConnectionConfig" }
 
   - name: update
     method: PUT
     title: Update connection details
     path: "/{connectionID}"
     parameters:
-      path:
-      - type: uint64
-        name: connectionID
-        required: true
-        title: Connection ID
+      path: [ { type: uint64, name: connectionID, required: true, title: "Connection ID" } ]
       post:
-      - name: handle
-        type: string
-        required: true
-        title: handle
-      - name: type
-        type: string
-        required: true
-        title: type
-      - name: meta
-        type: types.ConnectionMeta
-        required: true
-        title: meta
-        parser: types.ParseConnectionMeta
-      - name: config
-        type: types.ConnectionConfig
-        required: true
-        title: config
-        parser: types.ParseConnectionConfig
+      - { name: handle, type: "string",                 required: true }
+      - { name: type,   type: "string",                 required: true }
+      - { name: meta,   type: "types.ConnectionMeta",   required: true, parser: "types.ParseConnectionMeta" }
+      - { name: config, type: "types.ConnectionConfig", required: true, parser: "types.ParseConnectionConfig" }
 
   - name: read
     method: GET
     title: Read connection details
     path: "/{connectionID}"
     parameters:
-      path:
-      - type: uint64
-        name: connectionID
-        required: true
-        title: Connection ID
+      path: [ { type: uint64, name: connectionID, required: true, title: "Connection ID" } ]
   - name: delete
     method: DELETE
     title: Remove connection
     path: "/{connectionID}"
     parameters:
-      path:
-      - type: uint64
-        name: connectionID
-        required: true
-        title: Connection ID
+      path: [ { type: uint64, name: connectionID, required: true, title: "Connection ID" } ]
   - name: undelete
     method: POST
     title: Undelete connection
     path: "/{connectionID}/undelete"
     parameters:
-      path:
-      - type: uint64
-        name: connectionID
-        required: true
-        title: Connection ID
+      path: [ { type: uint64, name: connectionID, required: true, title: "Connection ID" } ]
 
 - title: Applications
   path: "/application"
diff --git a/system/rest/dal_connection.go b/system/rest/dal_connection.go
index 9c1ae1a8b..2adde8884 100644
--- a/system/rest/dal_connection.go
+++ b/system/rest/dal_connection.go
@@ -30,14 +30,6 @@ type (
 		connectionAc connectionAccessController
 	}
 
-	connectionWrap struct {
-		types.DalConnection
-
-		Type    string `json:"type"`
-		Primary bool   `json:"primary"`
-	}
-	connectionWrapSet []connectionWrap
-
 	connectionPayload struct {
 		*types.DalConnection
 
diff --git a/system/rest/request/dalConnection.go b/system/rest/request/dalConnection.go
index 52dd79d90..800b2fb39 100644
--- a/system/rest/request/dalConnection.go
+++ b/system/rest/request/dalConnection.go
@@ -59,22 +59,22 @@ type (
 	DalConnectionCreate struct {
 		// Handle POST parameter
 		//
-		// handle
+		//
 		Handle string
 
 		// Type POST parameter
 		//
-		// type
+		//
 		Type string
 
 		// Meta POST parameter
 		//
-		// meta
+		//
 		Meta types.ConnectionMeta
 
 		// Config POST parameter
 		//
-		// config
+		//
 		Config types.ConnectionConfig
 	}
 
@@ -86,22 +86,22 @@ type (
 
 		// Handle POST parameter
 		//
-		// handle
+		//
 		Handle string
 
 		// Type POST parameter
 		//
-		// type
+		//
 		Type string
 
 		// Meta POST parameter
 		//
-		// meta
+		//
 		Meta types.ConnectionMeta
 
 		// Config POST parameter
 		//
-		// config
+		//
 		Config types.ConnectionConfig
 	}
 
diff --git a/system/rest/request/dalSensitivityLevel.go b/system/rest/request/dalSensitivityLevel.go
index b0cb56555..920c22429 100644
--- a/system/rest/request/dalSensitivityLevel.go
+++ b/system/rest/request/dalSensitivityLevel.go
@@ -49,17 +49,17 @@ type (
 	DalSensitivityLevelCreate struct {
 		// Handle POST parameter
 		//
-		// handle
+		//
 		Handle string
 
 		// Level POST parameter
 		//
-		// level
+		//
 		Level int
 
 		// Meta POST parameter
 		//
-		// meta
+		//
 		Meta types.DalSensitivityLevelMeta
 	}
 
@@ -71,17 +71,17 @@ type (
 
 		// Handle POST parameter
 		//
-		// handle
+		//
 		Handle string
 
 		// Level POST parameter
 		//
-		// level
+		//
 		Level int
 
 		// Meta POST parameter
 		//
-		// meta
+		//
 		Meta types.DalSensitivityLevelMeta
 	}