diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 6ec158e75c..df840b76aa 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -20074,9 +20074,6 @@
           {
             "$ref": "#/components/parameters/ml.get_trained_models#include"
           },
-          {
-            "$ref": "#/components/parameters/ml.get_trained_models#include_model_definition"
-          },
           {
             "$ref": "#/components/parameters/ml.get_trained_models#size"
           },
@@ -21987,9 +21984,6 @@
           {
             "$ref": "#/components/parameters/ml.get_trained_models#include"
           },
-          {
-            "$ref": "#/components/parameters/ml.get_trained_models#include_model_definition"
-          },
           {
             "$ref": "#/components/parameters/ml.get_trained_models#size"
           },
@@ -22071,44 +22065,76 @@
         "operationId": "ml-infer-trained-model",
         "parameters": [
           {
-            "$ref": "#/components/parameters/ml.infer_trained_model#model_id"
+            "in": "path",
+            "name": "model_id",
+            "description": "The unique identifier of the trained model.",
+            "required": true,
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Id"
+            },
+            "style": "simple"
           },
           {
-            "$ref": "#/components/parameters/ml.infer_trained_model#timeout"
+            "in": "query",
+            "name": "timeout",
+            "description": "Controls the amount of time to wait for inference results.",
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Duration"
+            },
+            "style": "form"
           }
         ],
         "requestBody": {
-          "$ref": "#/components/requestBodies/ml.infer_trained_model"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/ml.infer_trained_model#200"
-          }
-        },
-        "x-state": "Added in 8.3.0"
-      }
-    },
-    "/_ml/trained_models/{model_id}/deployment/_infer": {
-      "post": {
-        "tags": [
-          "ml trained model"
-        ],
-        "summary": "Evaluate a trained model",
-        "operationId": "ml-infer-trained-model-1",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/ml.infer_trained_model#model_id"
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "docs": {
+                    "description": "An array of objects to pass to the model for inference. The objects should contain a fields matching your\nconfigured trained model input. Typically, for NLP models, the field name is `text_field`.\nCurrently, for NLP models, only a single value is allowed.",
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "object"
+                      }
+                    }
+                  },
+                  "inference_config": {
+                    "$ref": "#/components/schemas/ml._types:InferenceConfigUpdateContainer"
+                  }
+                },
+                "required": [
+                  "docs"
+                ]
+              }
+            }
           },
-          {
-            "$ref": "#/components/parameters/ml.infer_trained_model#timeout"
-          }
-        ],
-        "requestBody": {
-          "$ref": "#/components/requestBodies/ml.infer_trained_model"
+          "required": true
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/ml.infer_trained_model#200"
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "inference_results": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ml._types:InferenceResponseResult"
+                      }
+                    }
+                  },
+                  "required": [
+                    "inference_results"
+                  ]
+                }
+              }
+            }
           }
         },
         "x-state": "Added in 8.3.0"
@@ -96640,27 +96666,6 @@
           }
         }
       },
-      "ml.infer_trained_model#200": {
-        "description": "",
-        "content": {
-          "application/json": {
-            "schema": {
-              "type": "object",
-              "properties": {
-                "inference_results": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ml._types:InferenceResponseResult"
-                  }
-                }
-              },
-              "required": [
-                "inference_results"
-              ]
-            }
-          }
-        }
-      },
       "ml.preview_data_frame_analytics#200": {
         "description": "",
         "content": {
@@ -104773,16 +104778,6 @@
         },
         "style": "form"
       },
-      "ml.get_trained_models#include_model_definition": {
-        "in": "query",
-        "name": "include_model_definition",
-        "description": "parameter is deprecated! Use [include=definition] instead",
-        "deprecated": true,
-        "schema": {
-          "type": "boolean"
-        },
-        "style": "form"
-      },
       "ml.get_trained_models#size": {
         "in": "query",
         "name": "size",
@@ -104854,27 +104849,6 @@
         },
         "style": "form"
       },
-      "ml.infer_trained_model#model_id": {
-        "in": "path",
-        "name": "model_id",
-        "description": "The unique identifier of the trained model.",
-        "required": true,
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types:Id"
-        },
-        "style": "simple"
-      },
-      "ml.infer_trained_model#timeout": {
-        "in": "query",
-        "name": "timeout",
-        "description": "Controls the amount of time to wait for inference results.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types:Duration"
-        },
-        "style": "form"
-      },
       "ml.preview_data_frame_analytics#id": {
         "in": "path",
         "name": "id",
@@ -109560,34 +109534,6 @@
           }
         }
       },
-      "ml.infer_trained_model": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "type": "object",
-              "properties": {
-                "docs": {
-                  "description": "An array of objects to pass to the model for inference. The objects should contain a fields matching your\nconfigured trained model input. Typically, for NLP models, the field name is `text_field`.\nCurrently, for NLP models, only a single value is allowed.",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "type": "object"
-                    }
-                  }
-                },
-                "inference_config": {
-                  "$ref": "#/components/schemas/ml._types:InferenceConfigUpdateContainer"
-                }
-              },
-              "required": [
-                "docs"
-              ]
-            }
-          }
-        },
-        "required": true
-      },
       "ml.preview_data_frame_analytics": {
         "content": {
           "application/json": {
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index 5761bc6349..34dd358dd5 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -11206,9 +11206,6 @@
           {
             "$ref": "#/components/parameters/ml.get_trained_models#include"
           },
-          {
-            "$ref": "#/components/parameters/ml.get_trained_models#include_model_definition"
-          },
           {
             "$ref": "#/components/parameters/ml.get_trained_models#size"
           },
@@ -12311,9 +12308,6 @@
           {
             "$ref": "#/components/parameters/ml.get_trained_models#include"
           },
-          {
-            "$ref": "#/components/parameters/ml.get_trained_models#include_model_definition"
-          },
           {
             "$ref": "#/components/parameters/ml.get_trained_models#size"
           },
@@ -12395,44 +12389,76 @@
         "operationId": "ml-infer-trained-model",
         "parameters": [
           {
-            "$ref": "#/components/parameters/ml.infer_trained_model#model_id"
+            "in": "path",
+            "name": "model_id",
+            "description": "The unique identifier of the trained model.",
+            "required": true,
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Id"
+            },
+            "style": "simple"
           },
           {
-            "$ref": "#/components/parameters/ml.infer_trained_model#timeout"
+            "in": "query",
+            "name": "timeout",
+            "description": "Controls the amount of time to wait for inference results.",
+            "deprecated": false,
+            "schema": {
+              "$ref": "#/components/schemas/_types:Duration"
+            },
+            "style": "form"
           }
         ],
         "requestBody": {
-          "$ref": "#/components/requestBodies/ml.infer_trained_model"
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/ml.infer_trained_model#200"
-          }
-        },
-        "x-state": "Added in 8.3.0"
-      }
-    },
-    "/_ml/trained_models/{model_id}/deployment/_infer": {
-      "post": {
-        "tags": [
-          "ml trained model"
-        ],
-        "summary": "Evaluate a trained model",
-        "operationId": "ml-infer-trained-model-1",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/ml.infer_trained_model#model_id"
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "docs": {
+                    "description": "An array of objects to pass to the model for inference. The objects should contain a fields matching your\nconfigured trained model input. Typically, for NLP models, the field name is `text_field`.\nCurrently, for NLP models, only a single value is allowed.",
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "object"
+                      }
+                    }
+                  },
+                  "inference_config": {
+                    "$ref": "#/components/schemas/ml._types:InferenceConfigUpdateContainer"
+                  }
+                },
+                "required": [
+                  "docs"
+                ]
+              }
+            }
           },
-          {
-            "$ref": "#/components/parameters/ml.infer_trained_model#timeout"
-          }
-        ],
-        "requestBody": {
-          "$ref": "#/components/requestBodies/ml.infer_trained_model"
+          "required": true
         },
         "responses": {
           "200": {
-            "$ref": "#/components/responses/ml.infer_trained_model#200"
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "inference_results": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ml._types:InferenceResponseResult"
+                      }
+                    }
+                  },
+                  "required": [
+                    "inference_results"
+                  ]
+                }
+              }
+            }
           }
         },
         "x-state": "Added in 8.3.0"
@@ -57410,27 +57436,6 @@
           }
         }
       },
-      "ml.infer_trained_model#200": {
-        "description": "",
-        "content": {
-          "application/json": {
-            "schema": {
-              "type": "object",
-              "properties": {
-                "inference_results": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ml._types:InferenceResponseResult"
-                  }
-                }
-              },
-              "required": [
-                "inference_results"
-              ]
-            }
-          }
-        }
-      },
       "ml.preview_data_frame_analytics#200": {
         "description": "",
         "content": {
@@ -61700,16 +61705,6 @@
         },
         "style": "form"
       },
-      "ml.get_trained_models#include_model_definition": {
-        "in": "query",
-        "name": "include_model_definition",
-        "description": "parameter is deprecated! Use [include=definition] instead",
-        "deprecated": true,
-        "schema": {
-          "type": "boolean"
-        },
-        "style": "form"
-      },
       "ml.get_trained_models#size": {
         "in": "query",
         "name": "size",
@@ -61781,27 +61776,6 @@
         },
         "style": "form"
       },
-      "ml.infer_trained_model#model_id": {
-        "in": "path",
-        "name": "model_id",
-        "description": "The unique identifier of the trained model.",
-        "required": true,
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types:Id"
-        },
-        "style": "simple"
-      },
-      "ml.infer_trained_model#timeout": {
-        "in": "query",
-        "name": "timeout",
-        "description": "Controls the amount of time to wait for inference results.",
-        "deprecated": false,
-        "schema": {
-          "$ref": "#/components/schemas/_types:Duration"
-        },
-        "style": "form"
-      },
       "ml.preview_data_frame_analytics#id": {
         "in": "path",
         "name": "id",
@@ -64363,34 +64337,6 @@
           }
         }
       },
-      "ml.infer_trained_model": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "type": "object",
-              "properties": {
-                "docs": {
-                  "description": "An array of objects to pass to the model for inference. The objects should contain a fields matching your\nconfigured trained model input. Typically, for NLP models, the field name is `text_field`.\nCurrently, for NLP models, only a single value is allowed.",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "type": "object"
-                    }
-                  }
-                },
-                "inference_config": {
-                  "$ref": "#/components/schemas/ml._types:InferenceConfigUpdateContainer"
-                }
-              },
-              "required": [
-                "docs"
-              ]
-            }
-          }
-        },
-        "required": true
-      },
       "ml.preview_data_frame_analytics": {
         "content": {
           "application/json": {
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index dd4fafcc1f..1bf7fdfee7 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -6205,16 +6205,6 @@
             "POST"
           ],
           "path": "/_ml/trained_models/{model_id}/_infer"
-        },
-        {
-          "deprecation": {
-            "description": "/_ml/trained_models/{model_id}/deployment/_infer is deprecated. Use /_ml/trained_models/{model_id}/_infer instead",
-            "version": "8.3.0"
-          },
-          "methods": [
-            "POST"
-          ],
-          "path": "/_ml/trained_models/{model_id}/deployment/_infer"
         }
       ]
     },
@@ -29442,22 +29432,6 @@
             }
           }
         },
-        {
-          "deprecation": {
-            "description": "",
-            "version": "7.10.0"
-          },
-          "description": "parameter is deprecated! Use [include=definition] instead",
-          "name": "include_model_definition",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "boolean",
-              "namespace": "_builtins"
-            }
-          }
-        },
         {
           "description": "Specifies the maximum number of models to obtain.",
           "name": "size",
@@ -29499,7 +29473,7 @@
           }
         }
       ],
-      "specLocation": "ml/get_trained_models/MlGetTrainedModelRequest.ts#L25-L110"
+      "specLocation": "ml/get_trained_models/MlGetTrainedModelRequest.ts#L25-L104"
     },
     {
       "body": {
@@ -29740,7 +29714,7 @@
           }
         }
       ],
-      "specLocation": "ml/infer_trained_model/MlInferTrainedModelRequest.ts#L27-L72"
+      "specLocation": "ml/infer_trained_model/MlInferTrainedModelRequest.ts#L27-L67"
     },
     {
       "body": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index ad9f981b8c..ecb0259ca5 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -12305,16 +12305,6 @@
             "POST"
           ],
           "path": "/_ml/trained_models/{model_id}/_infer"
-        },
-        {
-          "deprecation": {
-            "description": "/_ml/trained_models/{model_id}/deployment/_infer is deprecated. Use /_ml/trained_models/{model_id}/_infer instead",
-            "version": "8.3.0"
-          },
-          "methods": [
-            "POST"
-          ],
-          "path": "/_ml/trained_models/{model_id}/deployment/_infer"
         }
       ]
     },
@@ -174374,22 +174364,6 @@
             }
           }
         },
-        {
-          "deprecation": {
-            "description": "",
-            "version": "7.10.0"
-          },
-          "description": "parameter is deprecated! Use [include=definition] instead",
-          "name": "include_model_definition",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "boolean",
-              "namespace": "_builtins"
-            }
-          }
-        },
         {
           "description": "Specifies the maximum number of models to obtain.",
           "name": "size",
@@ -174431,7 +174405,7 @@
           }
         }
       ],
-      "specLocation": "ml/get_trained_models/MlGetTrainedModelRequest.ts#L25-L110"
+      "specLocation": "ml/get_trained_models/MlGetTrainedModelRequest.ts#L25-L104"
     },
     {
       "kind": "response",
@@ -174672,7 +174646,7 @@
           }
         }
       ],
-      "specLocation": "ml/infer_trained_model/MlInferTrainedModelRequest.ts#L27-L72"
+      "specLocation": "ml/infer_trained_model/MlInferTrainedModelRequest.ts#L27-L67"
     },
     {
       "kind": "response",
diff --git a/output/schema/validation-errors.json b/output/schema/validation-errors.json
index 82e36e9e37..f60c531a5f 100644
--- a/output/schema/validation-errors.json
+++ b/output/schema/validation-errors.json
@@ -275,12 +275,6 @@
       ],
       "response": []
     },
-    "ml.stop_datafeed": {
-      "request": [
-        "Request: missing json spec query parameter 'allow_no_datafeeds'"
-      ],
-      "response": []
-    },
     "msearch": {
       "request": [
         "Request: query parameter 'allow_no_indices' does not exist in the json spec",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 5db4dbcfad..251a3af92c 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -15954,7 +15954,6 @@ export interface MlGetTrainedModelsRequest extends RequestBase {
   exclude_generated?: boolean
   from?: integer
   include?: MlInclude
-  include_model_definition?: boolean
   size?: integer
   tags?: string | string[]
 }
diff --git a/specification/_json_spec/ml.get_trained_models.json b/specification/_json_spec/ml.get_trained_models.json
index f8fbceabf9..9f1fb051d5 100644
--- a/specification/_json_spec/ml.get_trained_models.json
+++ b/specification/_json_spec/ml.get_trained_models.json
@@ -39,13 +39,6 @@
         "required": false,
         "description": "A comma-separate list of fields to optionally include. Valid options are 'definition' and 'total_feature_importance'. Default is none."
       },
-      "include_model_definition": {
-        "type": "boolean",
-        "required": false,
-        "description": "Should the full model definition be included in the results. These definitions can be large. So be cautious when including them. Defaults to false.",
-        "default": false,
-        "deprecated": true
-      },
       "decompress_definition": {
         "type": "boolean",
         "required": false,
diff --git a/specification/_json_spec/ml.infer_trained_model.json b/specification/_json_spec/ml.infer_trained_model.json
index 6e78e56e37..220f7c1fc4 100644
--- a/specification/_json_spec/ml.infer_trained_model.json
+++ b/specification/_json_spec/ml.infer_trained_model.json
@@ -22,21 +22,6 @@
               "required": true
             }
           }
-        },
-        {
-          "path": "/_ml/trained_models/{model_id}/deployment/_infer",
-          "methods": ["POST"],
-          "parts": {
-            "model_id": {
-              "type": "string",
-              "description": "The unique identifier of the trained model.",
-              "required": true
-            }
-          },
-          "deprecated": {
-            "version": "8.3.0",
-            "description": "/_ml/trained_models/{model_id}/deployment/_infer is deprecated. Use /_ml/trained_models/{model_id}/_infer instead"
-          }
         }
       ]
     },
diff --git a/specification/_json_spec/ml.stop_datafeed.json b/specification/_json_spec/ml.stop_datafeed.json
index 316c0dd24f..b3faacb438 100644
--- a/specification/_json_spec/ml.stop_datafeed.json
+++ b/specification/_json_spec/ml.stop_datafeed.json
@@ -30,12 +30,6 @@
         "required": false,
         "description": "Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)"
       },
-      "allow_no_datafeeds": {
-        "type": "boolean",
-        "required": false,
-        "description": "Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)",
-        "deprecated": true
-      },
       "force": {
         "type": "boolean",
         "required": false,
diff --git a/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts b/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts
index 0c4ec33b30..fa1d562e39 100644
--- a/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts
+++ b/specification/ml/get_trained_models/MlGetTrainedModelRequest.ts
@@ -89,12 +89,6 @@ export interface Request extends RequestBase {
      */
     include?: Include
 
-    /**
-     * parameter is deprecated! Use [include=definition] instead
-     * @deprecated 7.10.0
-     */
-    include_model_definition?: boolean
-
     /**
      * Specifies the maximum number of models to obtain.
      * @server_default 100
diff --git a/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts b/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts
index 78ec11b822..380de9553c 100644
--- a/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts
+++ b/specification/ml/infer_trained_model/MlInferTrainedModelRequest.ts
@@ -37,11 +37,6 @@ export interface Request extends RequestBase {
     {
       path: '/_ml/trained_models/{model_id}/_infer'
       methods: ['POST']
-    },
-    {
-      /** @deprecated 8.3.0 /_ml/trained_models/{model_id}/deployment/_infer is deprecated. Use /_ml/trained_models/{model_id}/_infer instead */
-      path: '/_ml/trained_models/{model_id}/deployment/_infer'
-      methods: ['POST']
     }
   ]
   path_parts: {