diff --git a/src/sunstone/public/app/utils/vcenter/templates.js b/src/sunstone/public/app/utils/vcenter/templates.js
index 72818c8995..781a9b3687 100644
--- a/src/sunstone/public/app/utils/vcenter/templates.js
+++ b/src/sunstone/public/app/utils/vcenter/templates.js
@@ -102,9 +102,6 @@ define(function(require) {
 
             $.each(elements, function(id, element) {
               var opts = {};
-              if (element.ds && element.ds !== '') {
-                opts.datastore = UserInputs.unmarshall(element.ds);
-              }
 
               if (element.rp && element.rp !== '') {
                 opts.resourcePool = UserInputs.unmarshall(element.rp);
@@ -169,27 +166,6 @@ define(function(require) {
         var attrs = [];
         var userInputs = [];
 
-        // Retrieve Datastore Attribute
-        var dsInput = $(".vcenter_datastore_input", row_context);
-        if (dsInput.length > 0) {
-          var dsModify = $('.modify_datastore', dsInput).val();
-          var dsInitial = $('.initial_datastore', dsInput).val();
-          var dsParams = $('.available_datastores', dsInput).val();
-
-          if (dsModify === 'fixed' && dsInitial !== '') {
-            attrs.push('VCENTER_DATASTORE="' + dsInitial + '"')
-          } else if (dsModify === 'list' && dsParams !== '') {
-            var dsUserInputsStr = UserInputs.marshall({
-                type: 'list',
-                description: Locale.tr("Which datastore you want this VM to run on?"),
-                initial: dsInitial,
-                params: dsParams
-              });
-
-            userInputs.push('VCENTER_DATASTORE="' + dsUserInputsStr + '"');
-          }
-        }
-
         // Retrieve Resource Pool Attribute
         var rpInput = $(".vcenter_rp_input", row_context);
         if (rpInput.length > 0) {
diff --git a/src/sunstone/public/app/utils/vcenter/templates/row.hbs b/src/sunstone/public/app/utils/vcenter/templates/row.hbs
index 18c00adafb..f205af1367 100644
--- a/src/sunstone/public/app/utils/vcenter/templates/row.hbs
+++ b/src/sunstone/public/app/utils/vcenter/templates/row.hbs
@@ -32,31 +32,6 @@
       <div class="row">
         <div class="large-11 large-centered columns">
           <div id="{{data.vcenter_ref}}Advanced" class="content" hidden>
-            {{#if datastore}}
-            <div class="vcenter_datastore_input row">
-              <div class="medium-3 columns">
-                <label>
-                  {{tr "Default Datastore"}}
-                  <input type="text" class="initial_datastore" value="{{datastore.initial}}"/>
-                </label>
-              </div>
-              <div class="medium-3 columns">
-                <label>
-                  {{tr "Type"}}
-                  <select class="modify_datastore">
-                    <option value="fixed">{{tr "Fixed"}}</option>
-                    <option value="list">{{tr "Provide on instantiation"}}</option>
-                  </select>
-                </label>
-              </div>
-              <div class="medium-4 columns end">
-                <label>
-                  {{tr "Available Datastores"}}
-                  <input type="text" class="available_datastores" value="{{datastore.params}}"/>
-                </label>
-              </div>
-            </div>
-            {{/if}}
             {{#if resourcePool}}
             <div class="vcenter_rp_input row">
               <div class="medium-3 columns">