diff --git a/source/_docs/automation/editor.markdown b/source/_docs/automation/editor.markdown
index a56deb7b1cf..b9615deadbe 100644
--- a/source/_docs/automation/editor.markdown
+++ b/source/_docs/automation/editor.markdown
@@ -5,7 +5,7 @@ description: "Instructions on how to use the automation editor."
 
 The automation editor is an easy way of creating and editing automations from the UI. This page uses the [Random sensor](/integrations/random#sensor) as an example, though any other sensor with a numeric value, can be used as well.
 
-From the UI choose **{% my config %}** which is located in the sidebar, then click on **{% my automations %}** to go to the automation editor. Press the **+** sign in the lower right corner to get started. You will be presented with options to create the automation from a description or from a [blueprint](/docs/automation/using_blueprints/).
+From the UI choose **{% my config %}** which is located in the sidebar, then click on **{% my automations %}** to go to the automation editor. Press the **Create Automation** button in the lower right corner to get started. You can create an automation based on a [blueprint](/docs/automation/using_blueprints/) or start from scratch.
 
 <p class='img'>
   <img src='/images/docs/automation-editor/create-automation.png' />
diff --git a/source/_docs/scripts/editor.markdown b/source/_docs/scripts/editor.markdown
deleted file mode 100644
index 752e6b541a0..00000000000
--- a/source/_docs/scripts/editor.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: "Script Editor"
-description: "Instructions on how to use the new script editor."
----
-
-In Home Assistant 0.52 we introduced the first version of our script editor. If you just created a new configuration with Home Assistant then you're all set! Go to the UI and enjoy.
-
-<div class='videoWrapper'>
-<iframe src="https://www.youtube.com/embed/_Rntpcj1CGA" frameborder="0" allowfullscreen></iframe>
-</div>
-
-## Updating your configuration to use the editor
-
-The script editor reads and writes to the file `scripts.yaml` in your [configuration](/docs/configuration/) folder. Make sure that you have set up the script integration to read from it:
-
-```yaml
-# Configuration.yaml example
-script: !include scripts.yaml
-```
-
-The content that was under `script:` should now be moved to `scripts.yaml` to be editable.
diff --git a/source/_includes/asides/docs_navigation.html b/source/_includes/asides/docs_navigation.html
index a47f0c7e9a1..3a7bfa2dd17 100644
--- a/source/_includes/asides/docs_navigation.html
+++ b/source/_includes/asides/docs_navigation.html
@@ -139,7 +139,6 @@
         <ul>
           <li>{% active_link /docs/scripts/service-calls/ Service Calls %}</li>
           <li>{% active_link /docs/scripts/conditions/ Conditions %}</li>
-          <li>{% active_link /docs/scripts/editor/ Editor %}</li>
         </ul>
       </li>
       <li>