diff --git a/content/rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/_index.md
index 700ec9fda08..cb025e6cd64 100644
--- a/content/rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/_index.md
+++ b/content/rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/_index.md
@@ -1,6 +1,7 @@
 ---
 title: Configuring Microsoft Active Directory Federation Service (SAML)
 weight: 1205
+draft: true
 ---
 _Available as of v2.0.7_
 
diff --git a/content/rancher/v2.x/en/admin-settings/authentication/ping-federate/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/ping-federate/_index.md
index 13e93180a97..a825626fb84 100644
--- a/content/rancher/v2.x/en/admin-settings/authentication/ping-federate/_index.md
+++ b/content/rancher/v2.x/en/admin-settings/authentication/ping-federate/_index.md
@@ -1,6 +1,7 @@
 ---
 title: Configuring PingIdentity (SAML)
 weight: 1200
+draft: true
 ---
 _Available as of v2.0.7_
 
diff --git a/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md b/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md
index 638672727e9..e4b0bc2fb99 100644
--- a/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md
+++ b/content/rancher/v2.x/en/admin-settings/pod-security-policies/_index.md
@@ -23,7 +23,7 @@ Read more about Pod Security Policies in the [Kubernetes Documentation](https://
 
 Using Rancher, you can create a Pod Security Policy using our GUI rather than creating a YAML file.
 
-## Default Pod Security Policies
+<!-- ## Default Pod Security Policies
 
 _Available as of v2.0.7_
 
@@ -40,7 +40,7 @@ Rancher ships with two default Pod Security Policies (PSPs): the `restricted` an
 	- Prevent pods from running as a privileged user and prevents escalation of privileges.
 	- Validates that server-required security mechanisms are in place (such as restricting what volumes can be mounted to only the core volume types and preventing root supplemental groups from being added). 
 
-
+-->
 
 ## Creating Pod Security Policies
 
diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
index e85474c6e8c..12d7f715973 100644
--- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
+++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
@@ -20,26 +20,23 @@ From this section you can choose:
 
 - Whether Rancher should check if the nodes are running a supported or unsupported version of Docker. If you only allow supported versions, the cluster automatically fails to launch if you have an unsupported version of Docker. Each Kubernetes version is tied to specific Docker versions based on what Kubernetes tests against.
 
-<<<<<<< HEAD
 - The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. 
 
     >**Note:** After you launch the cluster, you cannot change your network provider. Therefore, choose which network provider you want to use carefully, as Kubernetes doesn't allow switching between network providers. Once a cluster is created with a network provider, changing network providers would require you  tear down the entire cluster and all its applications.
-=======
-- The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. Out of the box, Rancher supports:
+<!-- - The [Network Provider](https://kubernetes.io/docs/concepts/cluster-administration/networking/) that the cluster uses. Out of the box, Rancher supports:
     
-    - <a id="canal"></a>**[Canal](https://github.com/projectcalico/canal)**: In v2.0.0 - v2.0.4 and v2.0.6, this was the default option for these clusters was Canal with network isolation. With the network isolation automatically enabled, it prevented any pod communication between [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).
->>>>>>> added content that describes the system project
+    - <a id="canal"></a>**[Canal](https://github.com/projectcalico/canal)**: In v2.0.0 - v2.0.4 and v2.0.6, this was the default option for these clusters was Canal with network isolation. With the network isolation automatically enabled, it prevented any pod communication between [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).-->
 
     Out of the box, Rancher supports the following network providers:
 
     - [Canal](https://github.com/projectcalico/canal)
     
-        The default networking option for cluster networking in all Rancher releases, with the exception of v2.0.5. As of release v2.0.7, if you use Canal, you also have the option of **Project Network Isolation**, which will enable or disable communication between pods in different [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).
+        The default networking option for cluster networking in all Rancher releases, with the exception of v2.0.5. <!--As of release v2.0.7, if you use Canal, you also have the option of **Project Network Isolation**, which will enable or disable communication between pods in different [projects]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/).
     
         >**Attention Rancher v2.0.0 - v2.0.6 Users**
         >
         >- In previous Rancher releases, Canal isolates project network communications with no option to disable it. If you are using any of these Rancher releases, be aware that using Canal prevents all communication between pods in different projects.
-        >- If you are have clusters using Canal and are upgrading to v2.0.7, those clusters enable Project Network Isolation by default. If you want to disable Project Network Isolation, edit the cluster and disable the option.
+        >- If you are have clusters using Canal and are upgrading to v2.0.7, those clusters enable Project Network Isolation by default. If you want to disable Project Network Isolation, edit the cluster and disable the option.-->
 
     - [Flannel](https://github.com/coreos/flannel#flannel)
     
diff --git a/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/_index.md
index bab43aa1ef3..8d729a2a605 100644
--- a/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/_index.md
+++ b/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/_index.md
@@ -17,16 +17,17 @@ You can use projects to perform actions like:
 - Assigning users specific roles in a project. A role can be owner, member, read-only, or [custom]({{< baseurl >}}/rancher/v2.x/en/admin-settings/rbac/default-custom-roles/). Policies include Kubernetes Role-Based Access Control (RBAC) policies.
 - Assigning Pod Security Policies.
 
+<!-- 
 When you create a cluster, two project are automatically created within it:
 
 - [Default Project](#default-project)
-- [System Project](#system-project)
+- [System Project](#system-project) -->
 
 ### Default Project
 
 When you provision a cluster, it automatically creates a `default` project for the cluster. This is a project you can use to get started with your cluster, but you can always delete it and replace it with projects that have more descriptive names.
 
-### System Project
+<!-- ### System Project
 
 _available as of v2.0.7_
 
@@ -46,7 +47,7 @@ The `system` project:
 > - The [Canal network plug-in]({{< baseurl >}}\rancher\v2.x\en\cluster-provisioning\rke-clusters\options\#canal) is in use.
 > - The Project Network Isolation option is enabled.
 >
->The `system` project overrides the Project Network Isolation option so that it can communicate with other projects, collect logs, and check health.
+>The `system` project overrides the Project Network Isolation option so that it can communicate with other projects, collect logs, and check health. -->
 
 ## Authorization