diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
index 83e558c3330..b7ad6c9f789 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
@@ -221,7 +221,6 @@ POST URL - http://localhost:8088:/app/v1/services/hbase-app-1
     {
       "name": "regionserver",
       "number_of_containers": 3,
-      "unique_component_support": "true",
       "artifact": {
         "id": "hbase:latest",
         "type": "DOCKER"
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
index 2b567b0057d..f1dc81b5de1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
@@ -220,7 +220,7 @@ One or more components of the service. If the service is HBase say, then the com
 
 |Name|Description|Required|Schema|Default|
 |----|----|----|----|----|
-|name|Name of the service component (mandatory). If Registry DNS is enabled, the max length is 63 characters. If unique component support is enabled, the max length is lowered to 44 characters.|true|string||
+|name|Name of the service component (mandatory). If Registry DNS is enabled, the max length is 44 characters.|true|string||
 |state|The state of the component|false|ComponentState||
 |dependencies|An array of service components which should be in READY state (as defined by readiness check), before this component can be started. The dependencies across all components of a service should be represented as a DAG.|false|string array||
 |readiness_check|Readiness check for this component.|false|ReadinessCheck||
@@ -638,7 +638,6 @@ POST URL - http://localhost:8088:/app/v1/services/hbase-app-1
     {
       "name": "regionserver",
       "number_of_containers": 3,
-      "unique_component_support": "true",
       "artifact": {
         "id": "hbase:latest",
         "type": "DOCKER"
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
index 19c74e114a5..2a9953dc979 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
@@ -65,7 +65,6 @@ export default DS.Model.extend({
       artifactType: 'DOCKER',
       launchCommand: '',
       dependencies: [],
-      uniqueComponentSupport: false,
       configuration: null
     });
   },
@@ -199,9 +198,6 @@ export default DS.Model.extend({
       cpus: record.get('cpus'),
       memory: record.get('memory')
     };
-    if (record.get('uniqueComponentSupport')) {
-      json['unique_component_support'] = "true";
-    }
     if (record.get('configuration')) {
       json['configuration'] = record.get('configuration');
     }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
index 9d519ae00ff..05a7451f4c9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
@@ -97,12 +97,6 @@
           <label class="required">Launch Command</label>
           {{input type="text" class="form-control" value=currentComponent.launchCommand}}
         </div>
-        <div class="form-group">
-          <label class="checkbox-inline">
-            {{input type="checkbox" checked=currentComponent.uniqueComponentSupport}}
-            Unique Component Support
-          </label>
-        </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>