diff --git a/static/rest-api.yaml b/static/rest-api.yaml
index 6cc30c0658..d3ee740295 100644
--- a/static/rest-api.yaml
+++ b/static/rest-api.yaml
@@ -352,10 +352,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/Mode"
+                $ref: "#/components/schemas/Mode"
   /loadpoints/{id}/phases/{phases}:
     post:
       summary: Update allowed phases
@@ -394,17 +391,14 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    allOf:
-                      - type: object
-                        properties:
-                          planId:
-                            $ref: "#/components/schemas/Id"
-                          precondition:
-                            $ref: "#/components/schemas/Precondition"
-                      - $ref: "#/components/schemas/PlanRates"
+                allOf:
+                  - type: object
+                    properties:
+                      planId:
+                        $ref: "#/components/schemas/Id"
+                      precondition:
+                        $ref: "#/components/schemas/Precondition"
+                  - $ref: "#/components/schemas/PlanRates"
   /loadpoints/{id}/plan/energy:
     delete:
       summary: Deletes the energy-based charging plan
@@ -437,10 +431,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/StaticEnergyPlan"
+                $ref: "#/components/schemas/StaticEnergyPlan"
   /loadpoints/{id}/plan/repeating/preview/{soc}/{weekdays}/{hourMinuteTime}/{timezone}:
     get:
       summary: Repeating plan preview
@@ -588,11 +579,8 @@ paths:
               schema:
                 type: object
                 properties:
-                  result:
-                    type: object
-                    properties:
-                      vehicle:
-                        $ref: "#/components/schemas/VehicleTitle"
+                  vehicle:
+                    $ref: "#/components/schemas/VehicleTitle"
   /prioritysoc/{soc}:
     post:
       summary: Set battery priority SoC
@@ -693,10 +681,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/ChargingSessions"
+                $ref: "#/components/schemas/ChargingSessions"
             text/csv:
               schema:
                 description: Download csv-file
@@ -782,10 +767,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/State"
+                $ref: "#/components/schemas/State"
   /system/log:
     get:
       summary: Logs
@@ -818,12 +800,9 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    type: array
-                    items:
-                      type: string
+                type: array
+                items:
+                  type: string
             text/plain:
               schema:
                 description: Download txt-file
@@ -846,10 +825,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/LogAreas"
+                $ref: "#/components/schemas/LogAreas"
         "401":
           $ref: "#/components/responses/Unauthorized"
   /system/shutdown:
@@ -897,11 +873,8 @@ paths:
               schema:
                 type: object
                 properties:
-                  result:
-                    type: object
-                    properties:
-                      rates:
-                        $ref: "#/components/schemas/Rates"
+                  rates:
+                    $ref: "#/components/schemas/Rates"
         "404":
           description: Tariff not defined
   /vehicles/{name}/limitsoc/{soc}:
@@ -954,10 +927,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/RepeatingPlans"
+                $ref: "#/components/schemas/RepeatingPlans"
   /vehicles/{name}/plan/soc:
     delete:
       summary: Delete a SoC-based charging plan
@@ -992,10 +962,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  result:
-                    $ref: "#/components/schemas/StaticSocPlan"
+                $ref: "#/components/schemas/StaticSocPlan"
 components:
   schemas:
     BatteryMode:
@@ -1423,28 +1390,19 @@ components:
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: integer
+            type: integer
     NumberResult:
       description: Success - Number result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: number
+            type: number
     IntegerResult:
       description: Success - Integer result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: integer
+            type: integer
     SocResult:
       description: Success - Soc result
       content:
@@ -1452,40 +1410,28 @@ components:
           schema:
             type: object
             properties:
-              result:
-                type: object
-                properties:
-                  soc:
-                    $ref: "#/components/schemas/Soc"
+              soc:
+                $ref: "#/components/schemas/Soc"
     PlanRatesResult:
       description: Success - PlanRates result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                $ref: "#/components/schemas/PlanRates"
+            $ref: "#/components/schemas/PlanRates"
     BooleanResult:
       description: Success - Boolean result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: boolean
+            type: boolean
     NullResult:
       description: Success - Null result
       content:
         application/json:
           schema:
+            description: Value is always null
             type: object
-            properties:
-              result:
-                description: Value is always null
-                type: object
-                nullable: true
+            nullable: true
     BlankResponse:
       description: Success - Blank response
     EmptyResult:
@@ -1507,14 +1453,11 @@ components:
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: integer
-                description: |
-                  Battery mode. 0: unknown, 1: normal, 2: hold, 3: charge
-                minimum: 0
-                maximum: 3
+            type: integer
+            description: |
+              Battery mode. 0: unknown, 1: normal, 2: hold, 3: charge
+            minimum: 0
+            maximum: 3
   securitySchemes:
     cookieAuth:
       type: apiKey