diff --git a/src/index.json b/src/index.json
index 66b03c8ad40..97d0299d70a 100644
--- a/src/index.json
+++ b/src/index.json
@@ -83695,52 +83695,6 @@
                 "sha256Digest": "a7e520e025c3caba24a782536377048f1749a99ceb54f009f33392fc9643570f"
             }
         ],
-        "sap-hana": [
-            {
-                "downloadUrl": "https://github.com/Azure/azure-hanaonazure-cli-extension/releases/download/0.6.5/sap_hana-0.6.5-py2.py3-none-any.whl",
-                "filename": "sap_hana-0.6.5-py2.py3-none-any.whl",
-                "metadata": {
-                    "azext.minCliCoreVersion": "2.0.46",
-                    "classifiers": [
-                        "Development Status :: 4 - Beta",
-                        "Intended Audience :: Developers",
-                        "Intended Audience :: System Administrators",
-                        "Programming Language :: Python",
-                        "Programming Language :: Python :: 2",
-                        "Programming Language :: Python :: 2.7",
-                        "Programming Language :: Python :: 3",
-                        "Programming Language :: Python :: 3.4",
-                        "Programming Language :: Python :: 3.5",
-                        "Programming Language :: Python :: 3.6",
-                        "License :: OSI Approved :: MIT License"
-                    ],
-                    "extensions": {
-                        "python.details": {
-                            "contacts": [
-                                {
-                                    "email": "azpycli@microsoft.com",
-                                    "name": "Microsoft Corporation",
-                                    "role": "author"
-                                }
-                            ],
-                            "document_names": {
-                                "description": "DESCRIPTION.rst"
-                            },
-                            "project_urls": {
-                                "Home": "https://github.com/Azure/azure-hanaonazure-cli-extension"
-                            }
-                        }
-                    },
-                    "generator": "bdist_wheel (0.30.0)",
-                    "license": "MIT",
-                    "metadata_version": "2.0",
-                    "name": "sap-hana",
-                    "summary": "Additional commands for working with SAP HanaOnAzure instances.",
-                    "version": "0.6.5"
-                },
-                "sha256Digest": "b4554c125f3a0eb5c891cec396e7705f6e91d4d81789acef20e3c4d172fa4543"
-            }
-        ],
         "scenario-guide": [
             {
                 "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/scenario_guide-0.1.1-py3-none-any.whl",
diff --git a/src/service_name.json b/src/service_name.json
index 5e2d183e2a8..667db4d70ef 100644
--- a/src/service_name.json
+++ b/src/service_name.json
@@ -298,12 +298,7 @@
     "Command": "az hack",
     "AzureServiceName": "Lab Services",
     "URL": "https://learn.microsoft.com/azure/lab-services/hackathon-labs"
-  },
-  {
-    "Command": "az hanainstance",
-    "AzureServiceName": "SAP on Azure",
-    "URL": "https://learn.microsoft.com/azure/virtual-machines/workloads/sap/hana-overview-architecture"
-  },
+  },  
   {
     "Command": "az healthbot",
     "AzureServiceName": "Bot Service",
@@ -528,12 +523,7 @@
     "Command": "az resource-mover",
     "AzureServiceName": "Resource Mover",
     "URL": "https://azure.microsoft.com/services/resource-mover"
-  },
-  {
-    "Command": "az sapmonitor",
-    "AzureServiceName": "SAP on Azure",
-    "URL": "https://learn.microsoft.com/azure/virtual-machines/workloads/sap/hana-overview-architecture"
-  },
+  },  
   {
     "Command": "az scenario",
     "AzureServiceName": "Azure CLI",