diff --git a/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs b/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
index 1ba20d2ab..1767febeb 100644
--- a/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
+++ b/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
@@ -109,14 +109,14 @@ namespace XenAdmin.Wizards.NewNetworkWizard_Pages
                 iconWarningSriovOption.Visible = labelWarningSriovOption.Visible = false;
                 rbtnSriov.Visible = labelSriov.Visible = false;
             }
-            else if (Helpers.FeatureForbidden(pool.Connection, Host.SriovNetworkDisabled) ||
+            else if (Helpers.FeatureForbidden(pool.Connection, Host.RestrictSriovNetwork) ||
                 sriovFeatureForbidden || !pool.HasSriovNic() || !hasNicCanEnableSriov)
             {
                 rbtnSriov.Checked = false;
                 rbtnSriov.Enabled = labelSriov.Enabled = false;
 
                 labelWarningSriovOption.Text =
-                    Helpers.FeatureForbidden(pool.Connection, Host.SriovNetworkDisabled)
+                    Helpers.FeatureForbidden(pool.Connection, Host.RestrictSriovNetwork)
                         ? String.Format(Messages.FEATURE_EXPERIMENTAL, Messages.NETWORK_SRIOV)
                         : sriovFeatureForbidden
                             ? String.Format(Messages.FEATURE_DISABLED, Messages.NETWORK_SRIOV)
diff --git a/XenAdmin/Wizards/NewSRWizard.cs b/XenAdmin/Wizards/NewSRWizard.cs
index 75a509507..f1e2c27ee 100644
--- a/XenAdmin/Wizards/NewSRWizard.cs
+++ b/XenAdmin/Wizards/NewSRWizard.cs
@@ -171,7 +171,7 @@ namespace XenAdmin.Wizards
             
 
             check.AddApiCheckRange(new RbacMethodList("SR.probe"));
-            if (Helpers.KolkataOrGreater(xenConnection) && !Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled))
+            if (Helpers.KolkataOrGreater(xenConnection) && !Helpers.FeatureForbidden(xenConnection, Host.RestrictCorosync))
                 check.AddApiCheckRange(new RbacMethodList("SR.probe_ext"));
 
             if (_srToReattach == null)
@@ -290,7 +290,7 @@ namespace XenAdmin.Wizards
                 else if (m_srWizardType is SrWizardType_Iscsi)
                 {
                     showProvisioningPage = Helpers.KolkataOrGreater(xenConnection) &&
-                                   !Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled);
+                                   !Helpers.FeatureForbidden(xenConnection, Host.RestrictCorosync);
                     if (showProvisioningPage)
                         AddPage(xenTabPageChooseSrProv);
                     AddPage(xenTabPageLvmoIscsi);
@@ -298,7 +298,7 @@ namespace XenAdmin.Wizards
                 else if (m_srWizardType is SrWizardType_Hba)
                 {
                     showProvisioningPage = Helpers.KolkataOrGreater(xenConnection) &&
-                                   !Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled);
+                                   !Helpers.FeatureForbidden(xenConnection, Host.RestrictCorosync);
                     if (showProvisioningPage)
                         AddPage(xenTabPageChooseSrProv);
                     AddPage(xenTabPageLvmoHba);
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
index b2c540473..c83358bd6 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
@@ -101,7 +101,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
             var existingSrDescriptors = new List<FibreChannelDescriptor>();
             var formatDiskDescriptors = new List<FibreChannelDescriptor>();
 
-            var performSecondProbe = Helpers.KolkataOrGreater(Connection) && !Helpers.FeatureForbidden(Connection, Host.CorosyncDisabled)
+            var performSecondProbe = Helpers.KolkataOrGreater(Connection) && !Helpers.FeatureForbidden(Connection, Host.RestrictCorosync)
                 && SrType != SR.SRTypes.lvmofcoe; // gfs2 over fcoe is not supported yet
 
             foreach (var device in _selectedDevices)
diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
index cef0ce681..a128df47f 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
@@ -154,7 +154,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
             }
 
             var performSecondProbe = Helpers.KolkataOrGreater(Connection) &&
-                                     !Helpers.FeatureForbidden(Connection, Host.CorosyncDisabled);
+                                     !Helpers.FeatureForbidden(Connection, Host.RestrictCorosync);
             if (performSecondProbe && srs.Count == 0)
             {
                 // Start second probe
diff --git a/XenModel/XenAPI-Extensions/Host.cs b/XenModel/XenAPI-Extensions/Host.cs
index 573a87387..10c1c7042 100644
--- a/XenModel/XenAPI-Extensions/Host.cs
+++ b/XenModel/XenAPI-Extensions/Host.cs
@@ -50,8 +50,8 @@ namespace XenAPI
         public enum Edition
         {
             Free,
-            PerSocket,             //Added in Clearwater (PR-1589)
-            XenDesktop,            //Added in Clearwater (PR-1589) and is new form of "EnterpriseXD"
+            PerSocket,     //Added in Clearwater (PR-1589)
+            XenDesktop,    //Added in Clearwater (PR-1589) and is new form of "EnterpriseXD"
             StandardPerSocket,     // Added in Creedence (standard-per-socket)
             Desktop,               // Added in Creedence (desktop)
             Standard,              // Added in Dundee/Violet (standard)
@@ -348,8 +348,8 @@ namespace XenAPI
 
         public static bool RestrictExportResourceData(Host h)
         {
-            return BoolKeyPreferTrue(h.license_params, "restrict_export_resource_data");
-        }
+                return BoolKeyPreferTrue(h.license_params, "restrict_export_resource_data");
+            }
 
         public static bool RestrictIntraPoolMigrate(Host h)
         {
@@ -445,17 +445,17 @@ namespace XenAPI
             return BoolKeyPreferTrue(h.license_params, "restrict_corosync");
         }
 
-        #region Experimental Features
+        //#region Experimental Features
 
-        public static bool CorosyncDisabled(Host h)
-        {
-            return  RestrictCorosync(h) && FeatureDisabled(h, "corosync");
-        }
+        //public static bool CorosyncDisabled(Host h)
+        //{
+        //    return  RestrictCorosync(h) && FeatureDisabled(h, "corosync");
+        //}
 
-        public static bool SriovNetworkDisabled(Host h)
-        {
-            return RestrictSriovNetwork(h) && FeatureDisabled(h, "network_sriov");
-        }
+        //public static bool SriovNetworkDisabled(Host h)
+        //{
+        //    return RestrictSriovNetwork(h) && FeatureDisabled(h, "network_sriov");
+        //}
 
         public static bool UefiBootDisabled(Host h)
         {