diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index ff26b25dde..f5d5a0fcf8 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -463,9 +463,6 @@ gimp_edit_fill (GimpImage            *image,
       undo_desc = C_("undo-type", "Fill with Pattern");
       break;
 
-    case GIMP_NO_FILL:
-      return TRUE;  /*  nothing to do, but the fill succeeded  */
-
     default:
       g_warning ("%s: unknown fill type", G_STRFUNC);
       return gimp_edit_fill (image, drawable,
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index ab1dcdb80a..90a04989d2 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -1558,9 +1558,6 @@ gimp_drawable_fill_by_type (GimpDrawable *drawable,
       pattern = gimp_context_get_pattern (context);
       break;
 
-    case GIMP_NO_FILL:
-      return;
-
     default:
       g_warning ("%s: unknown fill type %d", G_STRFUNC, fill_type);
       return;
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
index 02b6f00753..2adb254302 100644
--- a/app/core/gimptemplate.c
+++ b/app/core/gimptemplate.c
@@ -470,7 +470,7 @@ gimp_template_get_precision (GimpTemplate *template)
 GimpFillType
 gimp_template_get_fill_type (GimpTemplate *template)
 {
-  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_NO_FILL);
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_BACKGROUND_FILL);
 
   return GET_PRIVATE (template)->fill_type;
 }
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 071ec2265a..e62f127946 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -458,7 +458,6 @@ gimp_fill_type_get_type (void)
     { GIMP_WHITE_FILL, "GIMP_WHITE_FILL", "white-fill" },
     { GIMP_TRANSPARENT_FILL, "GIMP_TRANSPARENT_FILL", "transparent-fill" },
     { GIMP_PATTERN_FILL, "GIMP_PATTERN_FILL", "pattern-fill" },
-    { GIMP_NO_FILL, "GIMP_NO_FILL", "no-fill" },
     { 0, NULL, NULL }
   };
 
@@ -469,7 +468,6 @@ gimp_fill_type_get_type (void)
     { GIMP_WHITE_FILL, NC_("fill-type", "White"), NULL },
     { GIMP_TRANSPARENT_FILL, NC_("fill-type", "Transparency"), NULL },
     { GIMP_PATTERN_FILL, NC_("fill-type", "Pattern"), NULL },
-    { GIMP_NO_FILL, NC_("fill-type", "None"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 49d071bb78..815c427fd7 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -250,8 +250,7 @@ typedef enum
   GIMP_BACKGROUND_FILL,   /*< desc="Background color" >*/
   GIMP_WHITE_FILL,        /*< desc="White"            >*/
   GIMP_TRANSPARENT_FILL,  /*< desc="Transparency"     >*/
-  GIMP_PATTERN_FILL,      /*< desc="Pattern"          >*/
-  GIMP_NO_FILL            /*< desc="None",   pdb-skip >*/
+  GIMP_PATTERN_FILL       /*< desc="Pattern"          >*/
 } GimpFillType;