diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index 30029d2c87..f90163d181 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -192,7 +192,7 @@ namespace Umbraco.Core
                 if (File.Exists(filePath) == false) return string.Empty;
 
                 var hash = File.ReadAllText(filePath, Encoding.UTF8);
-                
+
                 _cachedAssembliesHash = hash;
                 return _cachedAssembliesHash;
             }
@@ -245,7 +245,7 @@ namespace Umbraco.Core
         internal static string GetFileHash(IEnumerable<Tuple<FileSystemInfo, bool>> filesAndFolders, ProfilingLogger logger)
         {
             using (logger.TraceDuration<PluginManager>("Determining hash of code files on disk", "Hash determined"))
-            {                
+            {
                 // get the distinct file infos to hash
                 var uniqInfos = new HashSet<string>();
                 var uniqContent = new HashSet<string>();
@@ -275,7 +275,7 @@ namespace Umbraco.Core
                         }
                     }
                     return generator.GenerateHash();
-                }                
+                }
             }
         }
 
@@ -315,9 +315,9 @@ namespace Umbraco.Core
                         generator.AddFileSystemItem(fileOrFolder);
                     }
                     return generator.GenerateHash();
-                }                
+                }
             }
-        }        
+        }
 
         #endregion
 
@@ -439,6 +439,10 @@ namespace Umbraco.Core
 
         internal void WriteCache()
         {
+            // be absolutely sure
+            if (Directory.Exists(_tempFolder) == false)
+                Directory.CreateDirectory(_tempFolder);
+
             var filePath = GetPluginListFilePath();
 
             using (var stream = GetFileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
diff --git a/src/Umbraco.Core/UdiEntityType.cs b/src/Umbraco.Core/UdiEntityType.cs
index 63cb818852..dd8be32931 100644
--- a/src/Umbraco.Core/UdiEntityType.cs
+++ b/src/Umbraco.Core/UdiEntityType.cs
@@ -15,6 +15,8 @@ namespace Umbraco.Core
         {
             // note: const fields in this class MUST be consistent with what GetTypes returns
             //  this is validated by UdiTests.ValidateUdiEntityType
+            // also, this is used exclusively in Udi static ctor, only once, so there is no
+            //  need to keep it around in a field nor to make it readonly
 
             internal static Dictionary<string, UdiType> GetTypes()
             {
diff --git a/src/Umbraco.Web.UI/config/grid.editors.config.js b/src/Umbraco.Web.UI/config/grid.editors.config.js
index 1adb6da2dc..12fa726f21 100644
--- a/src/Umbraco.Web.UI/config/grid.editors.config.js
+++ b/src/Umbraco.Web.UI/config/grid.editors.config.js
@@ -1,82 +1,27 @@
 [
-	{
-	    "name": "Rich text editor",
-	    "alias": "rte",
-	    "view": "rte",
-	    "icon": "icon-article"
-	},
-	{
-	    "name": "Image",
-	    "alias": "media",
-	    "view": "media",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Image wide",
-	    "alias": "media_wide",
-	    "view": "media",
-	    "render": "/App_Plugins/Grid/Editors/Render/media_wide.cshtml",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Image wide cropped",
-	    "alias": "media_wide_cropped",
-	    "view": "media",
-	    "render": "media",
-	    "icon": "icon-picture",
-	    "config": {
-	    	"size": {
-	    		"width": 1920,
-	    		"height": 700
-	    	}
-	    }
-	},
-	{
-	    "name": "Image rounded",
-	    "alias": "media_round",
-	    "view": "media",
-	    "render": "/App_Plugins/Grid/Editors/Render/media_round.cshtml",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Image w/ text right",
-	    "alias": "media_text_right",
-	    "view": "/App_Plugins/Grid/Editors/Views/media_with_description.html",
-	    "render": "/App_Plugins/Grid/Editors/Render/media_text_right.cshtml",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Macro",
-	    "alias": "macro",
-	    "view": "macro",
-	    "icon": "icon-settings-alt"
-	},
-	{
-	    "name": "Embed",
-	    "alias": "embed",
-	    "view": "embed",
-	    "render": "/App_Plugins/Grid/Editors/Render/embed_videowrapper.cshtml",
-	    "icon": "icon-movie-alt"
-	},
-	{
-        "name": "Banner Headline",
-        "alias": "banner_headline",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 36px; line-height: 45px; font-weight: bold; text-align:center",
-            "markup": "<h1 style='font-size:62px;text-align:center'>#value#</h1>"
-        }
+    {
+        "name": "Rich text editor",
+        "alias": "rte",
+        "view": "rte",
+        "icon": "icon-article"
     },
     {
-        "name": "Banner Tagline",
-        "alias": "banner_tagline",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 25px; line-height: 35px; font-weight: normal; text-align:center",
-            "markup": "<h2 style='font-weight: 100; font-size: 40px;text-align:center'>#value#</h2>"
-        }
+        "name": "Image",
+        "alias": "media",
+        "view": "media",
+        "icon": "icon-picture"
+    },
+    {
+        "name": "Macro",
+        "alias": "macro",
+        "view": "macro",
+        "icon": "icon-settings-alt"
+    },
+    {
+        "name": "Embed",
+        "alias": "embed",
+        "view": "embed",
+        "icon": "icon-movie-alt"
     },
     {
         "name": "Headline",
@@ -89,63 +34,13 @@
         }
     },
     {
-        "name": "Headline centered",
-        "alias": "headline_centered",
+        "name": "Quote",
+        "alias": "quote",
         "view": "textstring",
-        "icon": "icon-coin",
+        "icon": "icon-quote",
         "config": {
-            "style": "font-size: 30px; line-height: 45px; font-weight: bold; text-align:center;",
-            "markup": "<h1 style='text-align:center;'>#value#</h1>"
+            "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
+            "markup": "<blockquote>#value#</blockquote>"
         }
-    },
-    {
-        "name": "Abstract",
-        "alias": "abstract",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 16px; line-height: 20px; font-weight: bold;",
-            "markup": "<h3>#value#</h3>"
-        }
-    },
-    {
-        "name": "Paragraph",
-        "alias": "paragraph",
-        "view": "textstring",
-        "icon": "icon-font",
-        "config": {
-            "style": "font-size: 16px; line-height: 20px; font-weight: light;",
-            "markup": "<p>#value#</p>"
-        }
-    },
-	{
-	    "name": "Quote",
-	    "alias": "quote",
-	    "view": "textstring",
-	    "icon": "icon-quote",
-	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
-	        "markup": "<blockquote>#value#</blockquote>"
-	    }
-	},
-	{
-	    "name": "Quote with description",
-	    "alias": "quote_D",
-	    "view": "/App_Plugins/Grid/Editors/Views/quote_with_description.html",
-	    "render": "/App_Plugins/Grid/Editors/Render/quote_with_description.cshtml",
-	    "icon": "icon-quote",
-	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px"
-	    }
-	},
-	{
-	    "name": "Code",
-	    "alias": "code",
-	    "view": "textstring",
-	    "icon": "icon-code",
-	    "config": {
-	        "style": "overflow: auto;padding: 6px 10px;border: 1px solid #ddd;border-radius: 3px;background-color: #f8f8f8;font-size: .9rem;font-family: 'Courier 10 Pitch', Courier, monospace;line-height: 19px;",
-	        "markup": "<pre>#value#</pre>"
-	    }
-	}
+    }
 ]
\ No newline at end of file