diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index 8153b7af3f..f74e2a008d 100644
--- a/meta-poky/conf/toasterconf.json
+++ b/meta-poky/conf/toasterconf.json
@@ -40,13 +40,13 @@
             "name": "OpenEmbedded",
             "sourcetype": "layerindex",
             "apiurl": "http://layers.openembedded.org/layerindex/api/",
-            "branches": ["master", "jethro" ,"fido"]
+            "branches": ["master", "jethro"]
         },
         {
             "name": "Imported layers",
             "sourcetype": "imported",
             "apiurl": "",
-            "branches": ["master", "jethro","fido", "HEAD"]
+            "branches": ["master", "jethro", "HEAD"]
 
         }
     ],
@@ -63,12 +63,6 @@
             "branch": "jethro",
             "dirpath": "bitbake"
         },
-        {
-            "name": "fido",
-            "giturl": "remote:origin",
-            "branch": "fido",
-            "dirpath": "bitbake"
-        },
         {
             "name": "HEAD",
             "giturl": "remote:origin",
@@ -98,15 +92,6 @@
             "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
             "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch."
         },
-        {
-            "name": "fido",
-            "description": "Yocto Project 1.8 Fido",
-            "bitbake": "fido",
-            "branch": "fido",
-            "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
-            "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
-            "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\">Yocto Project 1.8 \"Fido\"</a> branch."
-        },
         {
             "name": "local",
             "description": "Local Yocto Project",