[gimp/gtk3-port: 239/460] pdb: remove all deprecated procedures



commit 95901137fa1fd91a91ab5a46b61b44e8ce6568a3
Author: Michael Natterer <mitch gimp org>
Date:   Sat Apr 28 20:15:15 2018 +0200

    pdb: remove all deprecated procedures

 app/pdb/Makefile.am                 |    5 -
 app/pdb/brushes-cmds.c              |  321 ----
 app/pdb/color-cmds.c                | 1413 ------------------
 app/pdb/context-cmds.c              |   81 -
 app/pdb/drawable-cmds.c             |   54 -
 app/pdb/drawable-transform-cmds.c   | 2813 -----------------------------------
 app/pdb/edit-cmds.c                 |  818 ----------
 app/pdb/floating-sel-cmds.c         |   90 --
 app/pdb/gradients-cmds.c            |  344 -----
 app/pdb/image-cmds.c                |  386 -----
 app/pdb/image-transform-cmds.c      |   76 -
 app/pdb/internal-procs.c            |    7 +-
 app/pdb/internal-procs.h            |    5 -
 app/pdb/layer-cmds.c                |  171 ---
 app/pdb/palettes-cmds.c             |  176 ---
 app/pdb/paths-cmds.c                | 1283 ----------------
 app/pdb/patterns-cmds.c             |  192 ---
 app/pdb/selection-cmds.c            |  159 --
 app/pdb/selection-tools-cmds.c      | 1052 -------------
 app/pdb/text-layer-cmds.c           |  148 --
 app/pdb/text-tool-cmds.c            |  359 -----
 app/pdb/transform-tools-cmds.c      |  910 -----------
 app/pdb/vectors-cmds.c              |   94 --
 libgimp/Makefile.am                 |   10 -
 libgimp/gimp.def                    |   76 -
 libgimp/gimp_pdb_headers.h          |    5 -
 libgimp/gimpbrushes_pdb.c           |  147 --
 libgimp/gimpbrushes_pdb.h           |   23 +-
 libgimp/gimpcolor_pdb.c             |  611 --------
 libgimp/gimpcolor_pdb.h             |  111 --
 libgimp/gimpcontext_pdb.c           |   53 -
 libgimp/gimpcontext_pdb.h           |    4 -
 libgimp/gimpdrawable_pdb.c          |   30 -
 libgimp/gimpdrawable_pdb.h          |    3 -
 libgimp/gimpdrawabletransform_pdb.c |  917 ------------
 libgimp/gimpdrawabletransform_pdb.h |  205 ---
 libgimp/gimpedit_pdb.c              |  364 -----
 libgimp/gimpedit_pdb.h              |   77 +-
 libgimp/gimpfloatingsel_pdb.c       |   60 -
 libgimp/gimpfloatingsel_pdb.h       |   16 +-
 libgimp/gimpgradients_pdb.c         |  128 --
 libgimp/gimpgradients_pdb.h         |   19 +-
 libgimp/gimpimage_pdb.c             |  126 --
 libgimp/gimpimage_pdb.h             |   14 -
 libgimp/gimpimagetransform_pdb.c    |   38 -
 libgimp/gimpimagetransform_pdb.h    |   41 +-
 libgimp/gimplayer_pdb.c             |   83 -
 libgimp/gimplayer_pdb.h             |   10 -
 libgimp/gimppalettes_pdb.c          |   69 -
 libgimp/gimppalettes_pdb.h          |   13 +-
 libgimp/gimppaths_pdb.c             |  560 -------
 libgimp/gimppaths_pdb.h             |   99 --
 libgimp/gimppatterns_pdb.c          |   85 --
 libgimp/gimppatterns_pdb.h          |   16 +-
 libgimp/gimpselection_pdb.c         |   84 --
 libgimp/gimpselection_pdb.h         |   67 +-
 libgimp/gimpselectiontools_pdb.c    |  461 ------
 libgimp/gimpselectiontools_pdb.h    |  123 --
 libgimp/gimptextlayer_pdb.c         |   74 -
 libgimp/gimptextlayer_pdb.h         |    7 -
 libgimp/gimptexttool_pdb.c          |  154 --
 libgimp/gimptexttool_pdb.h          |   34 -
 libgimp/gimptransformtools_pdb.c    |  287 ----
 libgimp/gimptransformtools_pdb.h    |   79 -
 libgimp/gimpvectors_pdb.c           |   44 -
 libgimp/gimpvectors_pdb.h           |    7 -
 pdb/Makefile.am                     |    5 -
 pdb/groups.pl                       |    5 -
 pdb/groups/brushes.pdb              |  139 +--
 pdb/groups/color.pdb                |  762 ----------
 pdb/groups/context.pdb              |   34 -
 pdb/groups/drawable.pdb             |   22 +-
 pdb/groups/drawable_transform.pdb   |  934 ------------
 pdb/groups/edit.pdb                 |  539 +-------
 pdb/groups/floating_sel.pdb         |   38 +-
 pdb/groups/gradients.pdb            |  186 +---
 pdb/groups/image.pdb                |  171 +---
 pdb/groups/image_transform.pdb      |   33 +-
 pdb/groups/layer.pdb                |   92 +--
 pdb/groups/palettes.pdb             |   80 +-
 pdb/groups/paths.pdb                |  636 --------
 pdb/groups/patterns.pdb             |   83 +-
 pdb/groups/selection.pdb            |   72 +-
 pdb/groups/selection_tools.pdb      |  419 ------
 pdb/groups/text_layer.pdb           |   79 +-
 pdb/groups/text_tool.pdb            |  128 +--
 pdb/groups/transform_tools.pdb      |  532 -------
 pdb/groups/vectors.pdb              |   38 -
 po/POTFILES.in                      |    5 -
 89 files changed, 99 insertions(+), 21324 deletions(-)
---
diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am
index f4b9dcd..ed5fcb9 100644
--- a/app/pdb/Makefile.am
+++ b/app/pdb/Makefile.am
@@ -39,14 +39,12 @@ libappinternal_procs_a_SOURCES = \
        brushes-cmds.c                  \
        buffer-cmds.c                   \
        channel-cmds.c                  \
-       color-cmds.c                    \
        context-cmds.c                  \
        debug-cmds.c                    \
        display-cmds.c                  \
        drawable-cmds.c                 \
        drawable-color-cmds.c           \
        drawable-edit-cmds.c            \
-       drawable-transform-cmds.c       \
        dynamics-cmds.c                 \
        edit-cmds.c                     \
        fileops-cmds.c                  \
@@ -76,7 +74,6 @@ libappinternal_procs_a_SOURCES = \
        palette-cmds.c                  \
        palette-select-cmds.c           \
        palettes-cmds.c                 \
-       paths-cmds.c                    \
        pattern-cmds.c                  \
        pattern-select-cmds.c           \
        patterns-cmds.c                 \
@@ -85,9 +82,7 @@ libappinternal_procs_a_SOURCES = \
        procedural-db-cmds.c            \
        progress-cmds.c                 \
        selection-cmds.c                \
-       selection-tools-cmds.c          \
        text-layer-cmds.c               \
        text-tool-cmds.c                \
-       transform-tools-cmds.c          \
        unit-cmds.c                     \
        vectors-cmds.c
diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c
index e03c898..1c995b8 100644
--- a/app/pdb/brushes-cmds.c
+++ b/app/pdb/brushes-cmds.c
@@ -90,166 +90,6 @@ brushes_get_list_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-brushes_get_brush_invoker (GimpProcedure         *procedure,
-                           Gimp                  *gimp,
-                           GimpContext           *context,
-                           GimpProgress          *progress,
-                           const GimpValueArray  *args,
-                           GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  gchar *name = NULL;
-  gint32 width = 0;
-  gint32 height = 0;
-  gint32 spacing = 0;
-
-  GimpBrush *brush = gimp_context_get_brush (context);
-
-  if (brush)
-    {
-      name    = g_strdup (gimp_object_get_name (brush));
-      width   = gimp_brush_get_width  (brush);
-      height  = gimp_brush_get_height (brush);
-      spacing = gimp_brush_get_spacing (brush);
-    }
-  else
-    success = FALSE;
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), name);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
-      g_value_set_int (gimp_value_array_index (return_vals, 3), height);
-      g_value_set_int (gimp_value_array_index (return_vals, 4), spacing);
-    }
-
-  return return_vals;
-}
-
-static GimpValueArray *
-brushes_get_spacing_invoker (GimpProcedure         *procedure,
-                             Gimp                  *gimp,
-                             GimpContext           *context,
-                             GimpProgress          *progress,
-                             const GimpValueArray  *args,
-                             GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  gint32 spacing = 0;
-
-  GimpBrush *brush = gimp_context_get_brush (context);
-
-  if (brush)
-    spacing = gimp_brush_get_spacing (brush);
-  else
-    success = FALSE;
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    g_value_set_int (gimp_value_array_index (return_vals, 1), spacing);
-
-  return return_vals;
-}
-
-static GimpValueArray *
-brushes_set_spacing_invoker (GimpProcedure         *procedure,
-                             Gimp                  *gimp,
-                             GimpContext           *context,
-                             GimpProgress          *progress,
-                             const GimpValueArray  *args,
-                             GError               **error)
-{
-  gboolean success = TRUE;
-  gint32 spacing;
-
-  spacing = g_value_get_int (gimp_value_array_index (args, 0));
-
-  if (success)
-    {
-      gimp_brush_set_spacing (gimp_context_get_brush (context), spacing);
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-brushes_get_brush_data_invoker (GimpProcedure         *procedure,
-                                Gimp                  *gimp,
-                                GimpContext           *context,
-                                GimpProgress          *progress,
-                                const GimpValueArray  *args,
-                                GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  const gchar *name;
-  gchar *actual_name = NULL;
-  gdouble opacity = 0.0;
-  gint32 spacing = 0;
-  gint32 paint_mode = 0;
-  gint32 width = 0;
-  gint32 height = 0;
-  gint32 length = 0;
-  guint8 *mask_data = NULL;
-
-  name = g_value_get_string (gimp_value_array_index (args, 0));
-
-  if (success)
-    {
-      GimpBrush *brush;
-
-      if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-        paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-      if (name && strlen (name))
-        brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
-      else
-        brush = gimp_context_get_brush (context);
-
-      if (brush)
-        {
-          GimpTempBuf *mask = gimp_brush_get_mask (brush);
-
-          actual_name = g_strdup (gimp_object_get_name (brush));
-          opacity     = 1.0;
-          spacing     = gimp_brush_get_spacing (brush);
-          paint_mode  = 0;
-          width       = gimp_brush_get_width  (brush);
-          height      = gimp_brush_get_height (brush);
-          length      = gimp_temp_buf_get_data_size (mask);
-          mask_data   = g_memdup (gimp_temp_buf_get_data (mask), length);
-        }
-      else
-        success = FALSE;
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
-      g_value_set_double (gimp_value_array_index (return_vals, 2), opacity);
-      g_value_set_int (gimp_value_array_index (return_vals, 3), spacing);
-      g_value_set_enum (gimp_value_array_index (return_vals, 4), paint_mode);
-      g_value_set_int (gimp_value_array_index (return_vals, 5), width);
-      g_value_set_int (gimp_value_array_index (return_vals, 6), height);
-      g_value_set_int (gimp_value_array_index (return_vals, 7), length);
-      gimp_value_take_int8array (gimp_value_array_index (return_vals, 8), mask_data, length);
-    }
-
-  return return_vals;
-}
-
 void
 register_brushes_procs (GimpPDB *pdb)
 {
@@ -306,165 +146,4 @@ register_brushes_procs (GimpPDB *pdb)
                                                                  GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-brushes-get-brush
-   */
-  procedure = gimp_procedure_new (brushes_get_brush_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-brushes-get-brush");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brushes-get-brush",
-                                     "Deprecated: Use 'gimp-context-get-brush' instead.",
-                                     "Deprecated: Use 'gimp-context-get-brush' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-context-get-brush");
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("name",
-                                                           "name",
-                                                           "The brush name",
-                                                           FALSE, FALSE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("width",
-                                                          "width",
-                                                          "The brush width",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("height",
-                                                          "height",
-                                                          "The brush height",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("spacing",
-                                                          "spacing",
-                                                          "The brush spacing",
-                                                          0, 1000, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-brushes-get-spacing
-   */
-  procedure = gimp_procedure_new (brushes_get_spacing_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-brushes-get-spacing");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brushes-get-spacing",
-                                     "Deprecated: Use 'gimp-brush-get-spacing' instead.",
-                                     "Deprecated: Use 'gimp-brush-get-spacing' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-brush-get-spacing");
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("spacing",
-                                                          "spacing",
-                                                          "The brush spacing",
-                                                          0, 1000, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-brushes-set-spacing
-   */
-  procedure = gimp_procedure_new (brushes_set_spacing_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-brushes-set-spacing");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brushes-set-spacing",
-                                     "Deprecated: Use 'gimp-brush-set-spacing' instead.",
-                                     "Deprecated: Use 'gimp-brush-set-spacing' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-brush-set-spacing");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("spacing",
-                                                      "spacing",
-                                                      "The brush spacing",
-                                                      0, 1000, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-brushes-get-brush-data
-   */
-  procedure = gimp_procedure_new (brushes_get_brush_data_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-brushes-get-brush-data");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brushes-get-brush-data",
-                                     "Deprecated: Use 'gimp-brush-get-pixels' instead.",
-                                     "Deprecated: Use 'gimp-brush-get-pixels' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-brush-get-pixels");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The brush name (\"\" means current active brush)",
-                                                       FALSE, TRUE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("actual-name",
-                                                           "actual name",
-                                                           "The brush name",
-                                                           FALSE, FALSE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("opacity",
-                                                        "opacity",
-                                                        "The brush opacity",
-                                                        0, 100, 0,
-                                                        GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("spacing",
-                                                          "spacing",
-                                                          "The brush spacing",
-                                                          0, 1000, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_enum ("paint-mode",
-                                                      "paint mode",
-                                                      "The paint mode",
-                                                      GIMP_TYPE_LAYER_MODE,
-                                                      GIMP_LAYER_MODE_NORMAL,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("width",
-                                                          "width",
-                                                          "The brush width",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("height",
-                                                          "height",
-                                                          "The brush height",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("length",
-                                                          "length",
-                                                          "Length of brush mask data",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int8_array ("mask-data",
-                                                               "mask data",
-                                                               "The brush mask data",
-                                                               GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
index 9099a7e..5966058 100644
--- a/app/pdb/context-cmds.c
+++ b/app/pdb/context-cmds.c
@@ -2515,41 +2515,6 @@ context_set_transform_resize_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-context_get_transform_recursion_invoker (GimpProcedure         *procedure,
-                                         Gimp                  *gimp,
-                                         GimpContext           *context,
-                                         GimpProgress          *progress,
-                                         const GimpValueArray  *args,
-                                         GError               **error)
-{
-  GimpValueArray *return_vals;
-  gint32 transform_recursion = 0;
-
-  transform_recursion = 3;
-
-  return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
-  g_value_set_int (gimp_value_array_index (return_vals, 1), transform_recursion);
-
-  return return_vals;
-}
-
-static GimpValueArray *
-context_set_transform_recursion_invoker (GimpProcedure         *procedure,
-                                         Gimp                  *gimp,
-                                         GimpContext           *context,
-                                         GimpProgress          *progress,
-                                         const GimpValueArray  *args,
-                                         GError               **error)
-{
-  gboolean success = TRUE;
-  if (success)
-    {
-    }
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 context_get_ink_size_invoker (GimpProcedure         *procedure,
                               Gimp                  *gimp,
                               GimpContext           *context,
@@ -5335,52 +5300,6 @@ register_context_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-context-get-transform-recursion
-   */
-  procedure = gimp_procedure_new (context_get_transform_recursion_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-context-get-transform-recursion");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-context-get-transform-recursion",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "",
-                                     "",
-                                     "",
-                                     "NONE");
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("transform-recursion",
-                                                          "transform recursion",
-                                                          "This returns always 3 and is meaningless",
-                                                          1, G_MAXINT32, 1,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-context-set-transform-recursion
-   */
-  procedure = gimp_procedure_new (context_set_transform_recursion_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-context-set-transform-recursion");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-context-set-transform-recursion",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "",
-                                     "",
-                                     "",
-                                     "NONE");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("transform-recursion",
-                                                      "transform recursion",
-                                                      "This parameter is ignored",
-                                                      1, G_MAXINT32, 1,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-context-get-ink-size
    */
   procedure = gimp_procedure_new (context_get_ink_size_invoker);
diff --git a/app/pdb/drawable-cmds.c b/app/pdb/drawable-cmds.c
index 8818b2e..eb7ba31 100644
--- a/app/pdb/drawable-cmds.c
+++ b/app/pdb/drawable-cmds.c
@@ -391,31 +391,6 @@ drawable_offsets_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-drawable_set_image_invoker (GimpProcedure         *procedure,
-                            Gimp                  *gimp,
-                            GimpContext           *context,
-                            GimpProgress          *progress,
-                            const GimpValueArray  *args,
-                            GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  GimpImage *image;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-  image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
-
-  if (success)
-    {
-      if (image != gimp_item_get_image (GIMP_ITEM (drawable)))
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 drawable_mask_bounds_invoker (GimpProcedure         *procedure,
                               Gimp                  *gimp,
                               GimpContext           *context,
@@ -1319,35 +1294,6 @@ register_drawable_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-drawable-set-image
-   */
-  procedure = gimp_procedure_new (drawable_set_image_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-drawable-set-image");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-drawable-set-image",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "",
-                                     "",
-                                     "",
-                                     "NONE");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-drawable-mask-bounds
    */
   procedure = gimp_procedure_new (drawable_mask_bounds_invoker);
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
index f3dfd0b..7702fec 100644
--- a/app/pdb/edit-cmds.c
+++ b/app/pdb/edit-cmds.c
@@ -30,20 +30,14 @@
 #include "pdb-types.h"
 
 #include "core/gimp-edit.h"
-#include "core/gimp-gradients.h"
 #include "core/gimp.h"
 #include "core/gimpbuffer.h"
-#include "core/gimpchannel.h"
-#include "core/gimpdrawable-bucket-fill.h"
 #include "core/gimpdrawable-edit.h"
-#include "core/gimpdrawable-gradient.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimplayer.h"
 #include "core/gimpparamspecs.h"
 #include "core/gimpprogress.h"
-#include "core/gimpstrokeoptions.h"
-#include "vectors/gimpvectors.h"
 
 #include "gimppdb.h"
 #include "gimppdb-utils.h"
@@ -506,435 +500,6 @@ edit_named_paste_as_new_image_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-edit_clear_invoker (GimpProcedure         *procedure,
-                    Gimp                  *gimp,
-                    GimpContext           *context,
-                    GimpProgress          *progress,
-                    const GimpValueArray  *args,
-                    GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                     GIMP_PDB_ITEM_CONTENT, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-        {
-          gimp_drawable_edit_clear (drawable, context);
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-edit_fill_invoker (GimpProcedure         *procedure,
-                   Gimp                  *gimp,
-                   GimpContext           *context,
-                   GimpProgress          *progress,
-                   const GimpValueArray  *args,
-                   GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  gint32 fill_type;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-  fill_type = g_value_get_enum (gimp_value_array_index (args, 1));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                     GIMP_PDB_ITEM_CONTENT, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-        {
-          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
-
-          if (gimp_fill_options_set_by_fill_type (options, context,
-                                                  fill_type, error))
-            {
-              gimp_drawable_edit_fill (drawable, options, NULL);
-            }
-          else
-            success = FALSE;
-
-          g_object_unref (options);
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-edit_bucket_fill_invoker (GimpProcedure         *procedure,
-                          Gimp                  *gimp,
-                          GimpContext           *context,
-                          GimpProgress          *progress,
-                          const GimpValueArray  *args,
-                          GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  gint32 fill_mode;
-  gint32 paint_mode;
-  gdouble opacity;
-  gdouble threshold;
-  gboolean sample_merged;
-  gdouble x;
-  gdouble y;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-  fill_mode = g_value_get_enum (gimp_value_array_index (args, 1));
-  paint_mode = g_value_get_enum (gimp_value_array_index (args, 2));
-  opacity = g_value_get_double (gimp_value_array_index (args, 3));
-  threshold = g_value_get_double (gimp_value_array_index (args, 4));
-  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 5));
-  x = g_value_get_double (gimp_value_array_index (args, 6));
-  y = g_value_get_double (gimp_value_array_index (args, 7));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                     GIMP_PDB_ITEM_CONTENT, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-        {
-          GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (drawable));
-          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
-
-          if (gimp_fill_options_set_by_fill_mode (options, context,
-                                                  fill_mode, error))
-            {
-              if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-                paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-              gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
-              gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
-
-              if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
-                {
-                  gimp_drawable_edit_fill (drawable, options, NULL);
-                }
-              else
-                {
-                  gimp_drawable_bucket_fill (drawable, options,
-                                             FALSE /* don't fill transparent */,
-                                             GIMP_SELECT_CRITERION_COMPOSITE,
-                                             threshold / 255.0,
-                                             sample_merged,
-                                             FALSE /* no diagonal neighbors */,
-                                             x, y);
-               }
-            }
-          else
-            success = FALSE;
-
-          g_object_unref (options);
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-edit_bucket_fill_full_invoker (GimpProcedure         *procedure,
-                               Gimp                  *gimp,
-                               GimpContext           *context,
-                               GimpProgress          *progress,
-                               const GimpValueArray  *args,
-                               GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  gint32 fill_mode;
-  gint32 paint_mode;
-  gdouble opacity;
-  gdouble threshold;
-  gboolean sample_merged;
-  gboolean fill_transparent;
-  gint32 select_criterion;
-  gdouble x;
-  gdouble y;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-  fill_mode = g_value_get_enum (gimp_value_array_index (args, 1));
-  paint_mode = g_value_get_enum (gimp_value_array_index (args, 2));
-  opacity = g_value_get_double (gimp_value_array_index (args, 3));
-  threshold = g_value_get_double (gimp_value_array_index (args, 4));
-  sample_merged = g_value_get_boolean (gimp_value_array_index (args, 5));
-  fill_transparent = g_value_get_boolean (gimp_value_array_index (args, 6));
-  select_criterion = g_value_get_enum (gimp_value_array_index (args, 7));
-  x = g_value_get_double (gimp_value_array_index (args, 8));
-  y = g_value_get_double (gimp_value_array_index (args, 9));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                     GIMP_PDB_ITEM_CONTENT, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-        {
-          GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (drawable));
-          GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
-
-          if (gimp_fill_options_set_by_fill_mode (options, context,
-                                                  fill_mode, error))
-            {
-              if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-                paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-              gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
-              gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
-
-              if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
-                {
-                  gimp_drawable_edit_fill (drawable, options, NULL);
-                }
-              else
-                {
-                  gimp_drawable_bucket_fill (drawable, options,
-                                             fill_transparent,
-                                             select_criterion,
-                                             threshold / 255.0,
-                                             sample_merged,
-                                             FALSE /* no diagonal neighbors */,
-                                             x, y);
-               }
-            }
-          else
-            success = FALSE;
-
-          g_object_unref (options);
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-edit_blend_invoker (GimpProcedure         *procedure,
-                    Gimp                  *gimp,
-                    GimpContext           *context,
-                    GimpProgress          *progress,
-                    const GimpValueArray  *args,
-                    GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  gint32 blend_mode;
-  gint32 paint_mode;
-  gint32 gradient_type;
-  gdouble opacity;
-  gdouble offset;
-  gint32 repeat;
-  gboolean reverse;
-  gboolean supersample;
-  gint32 max_depth;
-  gdouble threshold;
-  gboolean dither;
-  gdouble x1;
-  gdouble y1;
-  gdouble x2;
-  gdouble y2;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-  blend_mode = g_value_get_enum (gimp_value_array_index (args, 1));
-  paint_mode = g_value_get_enum (gimp_value_array_index (args, 2));
-  gradient_type = g_value_get_enum (gimp_value_array_index (args, 3));
-  opacity = g_value_get_double (gimp_value_array_index (args, 4));
-  offset = g_value_get_double (gimp_value_array_index (args, 5));
-  repeat = g_value_get_enum (gimp_value_array_index (args, 6));
-  reverse = g_value_get_boolean (gimp_value_array_index (args, 7));
-  supersample = g_value_get_boolean (gimp_value_array_index (args, 8));
-  max_depth = g_value_get_int (gimp_value_array_index (args, 9));
-  threshold = g_value_get_double (gimp_value_array_index (args, 10));
-  dither = g_value_get_boolean (gimp_value_array_index (args, 11));
-  x1 = g_value_get_double (gimp_value_array_index (args, 12));
-  y1 = g_value_get_double (gimp_value_array_index (args, 13));
-  x2 = g_value_get_double (gimp_value_array_index (args, 14));
-  y2 = g_value_get_double (gimp_value_array_index (args, 15));
-
-  if (success)
-    {
-      success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                            GIMP_PDB_ITEM_CONTENT, error) &&
-                 gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error));
-
-      if (success)
-        {
-          if (supersample)
-            {
-              if (max_depth < 1 || max_depth > 9)
-                success = FALSE;
-
-              if (threshold < 0.0 || threshold > 4.0)
-                success = FALSE;
-            }
-          else
-            {
-              max_depth = CLAMP (max_depth, 1, 9);
-              threshold = CLAMP (threshold, 0.0, 4.0);
-            }
-        }
-
-      if (success)
-        {
-          GimpGradient *gradient;
-
-          if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-            paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-          if (progress)
-            gimp_progress_start (progress, FALSE, _("Gradient"));
-
-          switch (blend_mode)
-            {
-            case GIMP_BLEND_FG_BG_RGB:
-              gradient = gimp_gradients_get_fg_bg_rgb (context->gimp);
-              break;
-
-            case GIMP_BLEND_FG_BG_HSV:
-              gradient = gimp_gradients_get_fg_bg_hsv_cw (context->gimp);
-              break;
-
-            case GIMP_BLEND_FG_TRANSPARENT:
-              gradient = gimp_gradients_get_fg_transparent (context->gimp);
-              break;
-
-            case GIMP_BLEND_CUSTOM:
-            default:
-              gradient = gimp_context_get_gradient (context);
-              break;
-            }
-
-          gimp_drawable_gradient (drawable,
-                                  context,
-                                  gradient,
-                                  GIMP_PDB_CONTEXT (context)->distance_metric,
-                                  paint_mode,
-                                  gradient_type,
-                                  opacity / 100.0,
-                                  offset, repeat, reverse,
-                                  GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                  supersample, max_depth,
-                                  threshold, dither,
-                                  x1, y1, x2, y2,
-                                  progress);
-
-          if (progress)
-            gimp_progress_end (progress);
-        }
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-edit_stroke_invoker (GimpProcedure         *procedure,
-                     Gimp                  *gimp,
-                     GimpContext           *context,
-                     GimpProgress          *progress,
-                     const GimpValueArray  *args,
-                     GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                     GIMP_PDB_ITEM_CONTENT, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-        {
-          GimpImage         *image = gimp_item_get_image (GIMP_ITEM (drawable));
-          GimpStrokeOptions *options;
-          GimpPaintOptions  *paint_options;
-
-          options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
-
-          paint_options =
-            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
-          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
-
-          success = gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)),
-                                      drawable, context, options, paint_options,
-                                      TRUE, progress, error);
-
-          g_object_unref (paint_options);
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-edit_stroke_vectors_invoker (GimpProcedure         *procedure,
-                             Gimp                  *gimp,
-                             GimpContext           *context,
-                             GimpProgress          *progress,
-                             const GimpValueArray  *args,
-                             GError               **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  GimpVectors *vectors;
-
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 0), gimp);
-  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                     GIMP_PDB_ITEM_CONTENT, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
-          gimp_pdb_item_is_attached (GIMP_ITEM (vectors),
-                                     gimp_item_get_image (GIMP_ITEM (drawable)),
-                                     0, error))
-        {
-          GimpStrokeOptions *options;
-          GimpPaintOptions  *paint_options;
-
-          options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
-
-          paint_options =
-            gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
-          paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
-
-          success = gimp_item_stroke (GIMP_ITEM (vectors),
-                                      drawable, context, options, paint_options,
-                                      TRUE, progress, error);
-
-          g_object_unref (paint_options);
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
 void
 register_edit_procs (GimpPDB *pdb)
 {
@@ -1267,387 +832,4 @@ register_edit_procs (GimpPDB *pdb)
                                                              GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-edit-clear
-   */
-  procedure = gimp_procedure_new (edit_clear_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-clear");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-clear",
-                                     "Clear selected area of drawable.",
-                                     "This procedure clears the specified drawable. If the drawable has an 
alpha channel, the cleared pixels will become transparent. If the drawable does not have an alpha channel, 
cleared pixels will be set to the background color. This procedure only affects regions within a selection if 
there is a selection active.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-clear' instead.",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "1995-1996",
-                                     "gimp-drawable-edit-clear");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable to clear from",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-edit-fill
-   */
-  procedure = gimp_procedure_new (edit_fill_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-fill");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-fill",
-                                     "Fill selected area of drawable.",
-                                     "This procedure fills the specified drawable with the fill mode. If the 
fill mode is foreground, the current foreground color is used. If the fill mode is background, the current 
background color is used. Other fill modes should not be used. This procedure only affects regions within a 
selection if there is a selection active. If you want to fill the whole drawable, regardless of the 
selection, use 'gimp-drawable-fill'.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-fill' instead.",
-                                     "Spencer Kimball & Peter Mattis & Raphael Quinet",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "1995-2000",
-                                     "gimp-drawable-edit-fill");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable to fill to",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("fill-type",
-                                                  "fill type",
-                                                  "The type of fill",
-                                                  GIMP_TYPE_FILL_TYPE,
-                                                  GIMP_FILL_FOREGROUND,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-edit-bucket-fill
-   */
-  procedure = gimp_procedure_new (edit_bucket_fill_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-bucket-fill");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-bucket-fill",
-                                     "Fill the area specified either by the current selection if there is 
one, or by a seed fill starting at the specified coordinates.",
-                                     "This tool requires information on the paint application mode, and the 
fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no 
selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the 
threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y 
arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used 
instead of that for the specified drawable. This is equivalent to sampling for colors after merging all 
visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; 
otherwise, they are relative to the drawable's origin.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-bucket-fill' instead.",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "1995-1996",
-                                     "gimp-drawable-edit-bucket-fill");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The affected drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("fill-mode",
-                                                  "fill mode",
-                                                  "The type of fill",
-                                                  GIMP_TYPE_BUCKET_FILL_MODE,
-                                                  GIMP_BUCKET_FILL_FG,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("paint-mode",
-                                                  "paint mode",
-                                                  "The paint application mode",
-                                                  GIMP_TYPE_LAYER_MODE,
-                                                  GIMP_LAYER_MODE_NORMAL,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("opacity",
-                                                    "opacity",
-                                                    "The opacity of the final bucket fill",
-                                                    0, 100, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("threshold",
-                                                    "threshold",
-                                                    "The threshold determines how extensive the seed fill 
will be. It's value is specified in terms of intensity levels. This parameter is only valid when there is no 
selection in the specified image.",
-                                                    0, 255, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("sample-merged",
-                                                     "sample merged",
-                                                     "Use the composite image, not the drawable",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("x",
-                                                    "x",
-                                                    "The x coordinate of this bucket fill's application. 
This parameter is only valid when there is no selection in the specified image.",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("y",
-                                                    "y",
-                                                    "The y coordinate of this bucket fill's application. 
This parameter is only valid when there is no selection in the specified image.",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-edit-bucket-fill-full
-   */
-  procedure = gimp_procedure_new (edit_bucket_fill_full_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-bucket-fill-full");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-bucket-fill-full",
-                                     "Fill the area specified either by the current selection if there is 
one, or by a seed fill starting at the specified coordinates.",
-                                     "This tool requires information on the paint application mode, and the 
fill mode, which can either be in the foreground color, or in the currently active pattern. If there is no 
selection, a seed fill is executed at the specified coordinates and extends outward in keeping with the 
threshold parameter. If there is a selection in the target image, the threshold, sample merged, x, and y 
arguments are unused. If the sample_merged parameter is TRUE, the data of the composite image will be used 
instead of that for the specified drawable. This is equivalent to sampling for colors after merging all 
visible layers. In the case of merged sampling, the x and y coordinates are relative to the image's origin; 
otherwise, they are relative to the drawable's origin.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-bucket-fill' instead.",
-                                     "David Gowers",
-                                     "David Gowers",
-                                     "2006",
-                                     "gimp-drawable-edit-bucket-fill");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The affected drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("fill-mode",
-                                                  "fill mode",
-                                                  "The type of fill",
-                                                  GIMP_TYPE_BUCKET_FILL_MODE,
-                                                  GIMP_BUCKET_FILL_FG,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("paint-mode",
-                                                  "paint mode",
-                                                  "The paint application mode",
-                                                  GIMP_TYPE_LAYER_MODE,
-                                                  GIMP_LAYER_MODE_NORMAL,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("opacity",
-                                                    "opacity",
-                                                    "The opacity of the final bucket fill",
-                                                    0, 100, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("threshold",
-                                                    "threshold",
-                                                    "The threshold determines how extensive the seed fill 
will be. It's value is specified in terms of intensity levels. This parameter is only valid when there is no 
selection in the specified image.",
-                                                    0, 255, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("sample-merged",
-                                                     "sample merged",
-                                                     "Use the composite image, not the drawable",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("fill-transparent",
-                                                     "fill transparent",
-                                                     "Whether to consider transparent pixels for filling. If 
TRUE, transparency is considered as a unique fillable color.",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("select-criterion",
-                                                  "select criterion",
-                                                  "The criterion used to determine color similarity. 
SELECT_CRITERION_COMPOSITE is the standard choice.",
-                                                  GIMP_TYPE_SELECT_CRITERION,
-                                                  GIMP_SELECT_CRITERION_COMPOSITE,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("x",
-                                                    "x",
-                                                    "The x coordinate of this bucket fill's application. 
This parameter is only valid when there is no selection in the specified image.",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("y",
-                                                    "y",
-                                                    "The y coordinate of this bucket fill's application. 
This parameter is only valid when there is no selection in the specified image.",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-edit-blend
-   */
-  procedure = gimp_procedure_new (edit_blend_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-blend");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-blend",
-                                     "Blend between the starting and ending coordinates with the specified 
blend mode and gradient type.",
-                                     "This tool requires information on the paint application mode, the 
blend mode, and the gradient type. It creates the specified variety of blend using the starting and ending 
coordinates as defined for each gradient type. For shapeburst gradient types, the context's distance metric 
is also relevant and can be updated with 'gimp-context-set-distance-metric'.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-gradient-fill' instead.",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "1995-1996",
-                                     "gimp-drawable-edit-gradient-fill");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The affected drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("blend-mode",
-                                                  "blend mode",
-                                                  "The type of blend",
-                                                  GIMP_TYPE_BLEND_MODE,
-                                                  GIMP_BLEND_FG_BG_RGB,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("paint-mode",
-                                                  "paint mode",
-                                                  "The paint application mode",
-                                                  GIMP_TYPE_LAYER_MODE,
-                                                  GIMP_LAYER_MODE_NORMAL,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("gradient-type",
-                                                  "gradient type",
-                                                  "The type of gradient",
-                                                  GIMP_TYPE_GRADIENT_TYPE,
-                                                  GIMP_GRADIENT_LINEAR,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("opacity",
-                                                    "opacity",
-                                                    "The opacity of the final blend",
-                                                    0, 100, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("offset",
-                                                    "offset",
-                                                    "Offset relates to the starting and ending coordinates 
specified for the blend. This parameter is mode dependent.",
-                                                    0, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("repeat",
-                                                  "repeat",
-                                                  "Repeat mode",
-                                                  GIMP_TYPE_REPEAT_MODE,
-                                                  GIMP_REPEAT_NONE,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("reverse",
-                                                     "reverse",
-                                                     "Use the reverse gradient",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("supersample",
-                                                     "supersample",
-                                                     "Do adaptive supersampling",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("max-depth",
-                                                      "max depth",
-                                                      "Maximum recursion levels for supersampling",
-                                                      1, 9, 1,
-                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("threshold",
-                                                    "threshold",
-                                                    "Supersampling threshold",
-                                                    0, 4, 0,
-                                                    GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("dither",
-                                                     "dither",
-                                                     "Use dithering to reduce banding",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("x1",
-                                                    "x1",
-                                                    "The x coordinate of this blend's starting point",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("y1",
-                                                    "y1",
-                                                    "The y coordinate of this blend's starting point",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("x2",
-                                                    "x2",
-                                                    "The x coordinate of this blend's ending point",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("y2",
-                                                    "y2",
-                                                    "The y coordinate of this blend's ending point",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-edit-stroke
-   */
-  procedure = gimp_procedure_new (edit_stroke_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-stroke");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-stroke",
-                                     "Stroke the current selection",
-                                     "This procedure strokes the current selection, painting along the 
selection boundary with the active brush and foreground color. The paint is applied to the specified drawable 
regardless of the active selection.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-stroke-selection' instead.",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "1995-1996",
-                                     "gimp-drawable-edit-stroke-selection");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable to stroke to",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-edit-stroke-vectors
-   */
-  procedure = gimp_procedure_new (edit_stroke_vectors_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-edit-stroke-vectors");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-edit-stroke-vectors",
-                                     "Stroke the specified vectors object",
-                                     "This procedure strokes the specified vectors object, painting along 
the path with the active brush and foreground color.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-drawable-edit-stroke-item' instead.",
-                                     "Simon Budig",
-                                     "Simon Budig",
-                                     "2006",
-                                     "gimp-drawable-edit-stroke-item");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable to stroke to",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/floating-sel-cmds.c b/app/pdb/floating-sel-cmds.c
index 9ec2099..f5073be 100644
--- a/app/pdb/floating-sel-cmds.c
+++ b/app/pdb/floating-sel-cmds.c
@@ -171,38 +171,6 @@ floating_sel_attach_invoker (GimpProcedure         *procedure,
                                            error ? *error : NULL);
 }
 
-static GimpValueArray *
-floating_sel_rigor_invoker (GimpProcedure         *procedure,
-                            Gimp                  *gimp,
-                            GimpContext           *context,
-                            GimpProgress          *progress,
-                            const GimpValueArray  *args,
-                            GError               **error)
-{
-  gboolean success = TRUE;
-  if (success)
-    {
-    }
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-floating_sel_relax_invoker (GimpProcedure         *procedure,
-                            Gimp                  *gimp,
-                            GimpContext           *context,
-                            GimpProgress          *progress,
-                            const GimpValueArray  *args,
-                            GError               **error)
-{
-  gboolean success = TRUE;
-  if (success)
-    {
-    }
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
 void
 register_floating_sel_procs (GimpPDB *pdb)
 {
@@ -305,62 +273,4 @@ register_floating_sel_procs (GimpPDB *pdb)
                                                             GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-floating-sel-rigor
-   */
-  procedure = gimp_procedure_new (floating_sel_rigor_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-floating-sel-rigor");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-floating-sel-rigor",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "",
-                                     "",
-                                     "",
-                                     "NONE");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("floating-sel",
-                                                         "floating sel",
-                                                         "The floating selection",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("undo",
-                                                     "undo",
-                                                     "",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-floating-sel-relax
-   */
-  procedure = gimp_procedure_new (floating_sel_relax_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-floating-sel-relax");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-floating-sel-relax",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "Deprecated: There is no replacement for this procedure.",
-                                     "",
-                                     "",
-                                     "",
-                                     "NONE");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("floating-sel",
-                                                         "floating sel",
-                                                         "The floating selection",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("undo",
-                                                     "undo",
-                                                     "",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/gradients-cmds.c b/app/pdb/gradients-cmds.c
index 12002ab..f533371 100644
--- a/app/pdb/gradients-cmds.c
+++ b/app/pdb/gradients-cmds.c
@@ -89,211 +89,6 @@ gradients_get_list_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-gradients_sample_uniform_invoker (GimpProcedure         *procedure,
-                                  Gimp                  *gimp,
-                                  GimpContext           *context,
-                                  GimpProgress          *progress,
-                                  const GimpValueArray  *args,
-                                  GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  gint32 num_samples;
-  gboolean reverse;
-  gint32 array_length = 0;
-  gdouble *color_samples = NULL;
-
-  num_samples = g_value_get_int (gimp_value_array_index (args, 0));
-  reverse = g_value_get_boolean (gimp_value_array_index (args, 1));
-
-  if (success)
-    {
-      GimpGradient        *gradient;
-      GimpGradientSegment *seg = NULL;
-      gdouble              pos, delta;
-      GimpRGB              color;
-      gdouble             *pv;
-
-      pos   = 0.0;
-      delta = 1.0 / (num_samples - 1);
-
-      array_length = num_samples * 4;
-
-      pv = color_samples = g_new (gdouble, array_length);
-
-      gradient = gimp_context_get_gradient (context);
-
-      while (num_samples--)
-        {
-          seg = gimp_gradient_get_color_at (gradient, context, seg,
-                                            pos, reverse,
-                                            GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                            &color);
-
-          *pv++ = color.r;
-          *pv++ = color.g;
-          *pv++ = color.b;
-          *pv++ = color.a;
-
-          pos += delta;
-        }
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_set_int (gimp_value_array_index (return_vals, 1), array_length);
-      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), color_samples, array_length);
-    }
-
-  return return_vals;
-}
-
-static GimpValueArray *
-gradients_sample_custom_invoker (GimpProcedure         *procedure,
-                                 Gimp                  *gimp,
-                                 GimpContext           *context,
-                                 GimpProgress          *progress,
-                                 const GimpValueArray  *args,
-                                 GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  gint32 num_samples;
-  const gdouble *positions;
-  gboolean reverse;
-  gint32 array_length = 0;
-  gdouble *color_samples = NULL;
-
-  num_samples = g_value_get_int (gimp_value_array_index (args, 0));
-  positions = gimp_value_get_floatarray (gimp_value_array_index (args, 1));
-  reverse = g_value_get_boolean (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      GimpGradient        *gradient;
-      GimpGradientSegment *seg = NULL;
-      GimpRGB              color;
-      gdouble             *pv;
-
-      array_length = num_samples * 4;
-
-      pv = color_samples = g_new (gdouble, array_length);
-
-      gradient = gimp_context_get_gradient (context);
-
-      while (num_samples--)
-        {
-          seg = gimp_gradient_get_color_at (gradient, context, seg,
-                                            *positions, reverse,
-                                            GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                            &color);
-
-          *pv++ = color.r;
-          *pv++ = color.g;
-          *pv++ = color.b;
-          *pv++ = color.a;
-
-          positions++;
-        }
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_set_int (gimp_value_array_index (return_vals, 1), array_length);
-      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 2), color_samples, array_length);
-    }
-
-  return return_vals;
-}
-
-static GimpValueArray *
-gradients_get_gradient_data_invoker (GimpProcedure         *procedure,
-                                     Gimp                  *gimp,
-                                     GimpContext           *context,
-                                     GimpProgress          *progress,
-                                     const GimpValueArray  *args,
-                                     GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  const gchar *name;
-  gint32 sample_size;
-  gboolean reverse;
-  gchar *actual_name = NULL;
-  gint32 width = 0;
-  gdouble *grad_data = NULL;
-
-  name = g_value_get_string (gimp_value_array_index (args, 0));
-  sample_size = g_value_get_int (gimp_value_array_index (args, 1));
-  reverse = g_value_get_boolean (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      GimpGradient *gradient;
-
-      if (sample_size < 1 || sample_size > 10000)
-        sample_size = GIMP_GRADIENT_DEFAULT_SAMPLE_SIZE;
-
-      if (name && strlen (name))
-        gradient = gimp_pdb_get_gradient (gimp, name, FALSE, error);
-      else
-        gradient = gimp_context_get_gradient (context);
-
-      if (gradient)
-        {
-          GimpGradientSegment *seg = NULL;
-          gdouble             *pv;
-          gdouble              pos, delta;
-          GimpRGB              color;
-
-          pos   = 0.0;
-          delta = 1.0 / (sample_size - 1);
-
-          actual_name = g_strdup (gimp_object_get_name (gradient));
-          grad_data   = g_new (gdouble, sample_size * 4);
-          width       = sample_size * 4;
-
-          pv = grad_data;
-
-          while (sample_size--)
-            {
-              seg = gimp_gradient_get_color_at (gradient, context, seg,
-                                                pos, reverse,
-                                                GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                                &color);
-
-              *pv++ = color.r;
-              *pv++ = color.g;
-              *pv++ = color.b;
-              *pv++ = color.a;
-
-              pos += delta;
-            }
-        }
-      else
-        success = FALSE;
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
-      gimp_value_take_floatarray (gimp_value_array_index (return_vals, 3), grad_data, width);
-    }
-
-  return return_vals;
-}
-
 void
 register_gradients_procs (GimpPDB *pdb)
 {
@@ -350,143 +145,4 @@ register_gradients_procs (GimpPDB *pdb)
                                                                  GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-gradients-sample-uniform
-   */
-  procedure = gimp_procedure_new (gradients_sample_uniform_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-gradients-sample-uniform");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-gradients-sample-uniform",
-                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
-                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-gradient-get-uniform-samples");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("num-samples",
-                                                      "num samples",
-                                                      "The number of samples to take",
-                                                      2, G_MAXINT32, 2,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("reverse",
-                                                     "reverse",
-                                                     "Use the reverse gradient",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("array-length",
-                                                          "array length",
-                                                          "Length of the color_samples array (4 * 
num_samples)",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_float_array ("color-samples",
-                                                                "color samples",
-                                                                "Color samples: { R1, G1, B1, A1, ..., Rn, 
Gn, Bn, An }",
-                                                                GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-gradients-sample-custom
-   */
-  procedure = gimp_procedure_new (gradients_sample_custom_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-gradients-sample-custom");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-gradients-sample-custom",
-                                     "Deprecated: Use 'gimp-gradient-get-custom-samples' instead.",
-                                     "Deprecated: Use 'gimp-gradient-get-custom-samples' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-gradient-get-custom-samples");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("num-samples",
-                                                      "num samples",
-                                                      "The number of samples to take",
-                                                      0, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_float_array ("positions",
-                                                            "positions",
-                                                            "The list of positions to sample along the 
gradient",
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("reverse",
-                                                     "reverse",
-                                                     "Use the reverse gradient",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("array-length",
-                                                          "array length",
-                                                          "Length of the color_samples array (4 * 
num_samples)",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_float_array ("color-samples",
-                                                                "color samples",
-                                                                "Color samples: { R1, G1, B1, A1, ..., Rn, 
Gn, Bn, An }",
-                                                                GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-gradients-get-gradient-data
-   */
-  procedure = gimp_procedure_new (gradients_get_gradient_data_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-gradients-get-gradient-data");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-gradients-get-gradient-data",
-                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
-                                     "Deprecated: Use 'gimp-gradient-get-uniform-samples' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-gradient-get-uniform-samples");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The gradient name (\"\" means current active 
gradient)",
-                                                       FALSE, TRUE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("sample-size",
-                                                      "sample size",
-                                                      "Size of the sample to return when the gradient is 
changed",
-                                                      1, 10000, 1,
-                                                      GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("reverse",
-                                                     "reverse",
-                                                     "Use the reverse gradient",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("actual-name",
-                                                           "actual name",
-                                                           "The gradient name",
-                                                           FALSE, FALSE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("width",
-                                                          "width",
-                                                          "The gradient sample width (r,g,b,a)",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_float_array ("grad-data",
-                                                                "grad data",
-                                                                "The gradient sample data",
-                                                                GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index 318620a..fa571dc 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -46,7 +46,6 @@
 #include "core/gimpimage.h"
 #include "core/gimpitem.h"
 #include "core/gimplayer.h"
-#include "core/gimplayermask.h"
 #include "core/gimpparamspecs.h"
 #include "core/gimppickable.h"
 #include "core/gimpprogress.h"
@@ -423,22 +422,6 @@ image_height_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-image_free_shadow_invoker (GimpProcedure         *procedure,
-                           Gimp                  *gimp,
-                           GimpContext           *context,
-                           GimpProgress          *progress,
-                           const GimpValueArray  *args,
-                           GError               **error)
-{
-  gboolean success = TRUE;
-  if (success)
-    {
-    }
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 image_get_layers_invoker (GimpProcedure         *procedure,
                           Gimp                  *gimp,
                           GimpContext           *context,
@@ -788,43 +771,6 @@ image_pick_correlate_layer_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-image_add_layer_invoker (GimpProcedure         *procedure,
-                         Gimp                  *gimp,
-                         GimpContext           *context,
-                         GimpProgress          *progress,
-                         const GimpValueArray  *args,
-                         GError               **error)
-{
-  gboolean success = TRUE;
-  GimpImage *image;
-  GimpLayer *layer;
-  gint32 position;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
-  position = g_value_get_int (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_floating (GIMP_ITEM (layer), image, error) &&
-          gimp_pdb_image_is_base_type (image,
-                                       gimp_drawable_get_base_type (GIMP_DRAWABLE (layer)),
-                                       error))
-        {
-          success = gimp_image_add_layer (image, layer,
-                                          NULL, MAX (position, -1), TRUE);
-        }
-      else
-        {
-          success = FALSE;
-        }
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 image_insert_layer_invoker (GimpProcedure         *procedure,
                             Gimp                  *gimp,
                             GimpContext           *context,
@@ -958,40 +904,6 @@ image_thaw_layers_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-image_add_channel_invoker (GimpProcedure         *procedure,
-                           Gimp                  *gimp,
-                           GimpContext           *context,
-                           GimpProgress          *progress,
-                           const GimpValueArray  *args,
-                           GError               **error)
-{
-  gboolean success = TRUE;
-  GimpImage *image;
-  GimpChannel *channel;
-  gint32 position;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  channel = gimp_value_get_channel (gimp_value_array_index (args, 1), gimp);
-  position = g_value_get_int (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_floating (GIMP_ITEM (channel), image, error))
-        {
-          success = gimp_image_add_channel (image, channel,
-                                            NULL, MAX (position, -1), TRUE);
-        }
-      else
-        {
-          success = FALSE;
-        }
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 image_insert_channel_invoker (GimpProcedure         *procedure,
                               Gimp                  *gimp,
                               GimpContext           *context,
@@ -1122,40 +1034,6 @@ image_thaw_channels_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-image_add_vectors_invoker (GimpProcedure         *procedure,
-                           Gimp                  *gimp,
-                           GimpContext           *context,
-                           GimpProgress          *progress,
-                           const GimpValueArray  *args,
-                           GError               **error)
-{
-  gboolean success = TRUE;
-  GimpImage *image;
-  GimpVectors *vectors;
-  gint32 position;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 1), gimp);
-  position = g_value_get_int (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_floating (GIMP_ITEM (vectors), image, error))
-        {
-          success = gimp_image_add_vectors (image, vectors,
-                                            NULL, MAX (position, -1), TRUE);
-        }
-      else
-        {
-          success = FALSE;
-        }
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 image_insert_vectors_invoker (GimpProcedure         *procedure,
                               Gimp                  *gimp,
                               GimpContext           *context,
@@ -1575,71 +1453,6 @@ image_merge_down_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-image_add_layer_mask_invoker (GimpProcedure         *procedure,
-                              Gimp                  *gimp,
-                              GimpContext           *context,
-                              GimpProgress          *progress,
-                              const GimpValueArray  *args,
-                              GError               **error)
-{
-  gboolean success = TRUE;
-  GimpImage *image;
-  GimpLayer *layer;
-  GimpLayerMask *mask;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
-  mask = gimp_value_get_layer_mask (gimp_value_array_index (args, 2), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_floating (GIMP_ITEM (mask), image, error) &&
-          gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
-        success = (gimp_layer_add_mask (layer, mask, TRUE, error) == mask);
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-image_remove_layer_mask_invoker (GimpProcedure         *procedure,
-                                 Gimp                  *gimp,
-                                 GimpContext           *context,
-                                 GimpProgress          *progress,
-                                 const GimpValueArray  *args,
-                                 GError               **error)
-{
-  gboolean success = TRUE;
-  GimpImage *image;
-  GimpLayer *layer;
-  gint32 mode;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 1), gimp);
-  mode = g_value_get_enum (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      GimpPDBItemModify modify = 0;
-
-      if (mode == GIMP_MASK_APPLY)
-        modify |= GIMP_PDB_ITEM_CONTENT;
-
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, modify, error) &&
-          gimp_layer_get_mask (layer))
-        gimp_layer_apply_mask (layer, mode, TRUE);
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 image_get_colormap_invoker (GimpProcedure         *procedure,
                             Gimp                  *gimp,
                             GimpContext           *context,
@@ -3300,29 +3113,6 @@ register_image_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-image-free-shadow
-   */
-  procedure = gimp_procedure_new (image_free_shadow_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-free-shadow");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-free-shadow",
-                                     "Deprecated: Use 'gimp-drawable-free-shadow' instead.",
-                                     "Deprecated: Use 'gimp-drawable-free-shadow' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-drawable-free-shadow");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-image-get-layers
    */
   procedure = gimp_procedure_new (image_get_layers_invoker);
@@ -3642,41 +3432,6 @@ register_image_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-image-add-layer
-   */
-  procedure = gimp_procedure_new (image_add_layer_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-add-layer");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-add-layer",
-                                     "Deprecated: Use 'gimp-image-insert-layer' instead.",
-                                     "Deprecated: Use 'gimp-image-insert-layer' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-image-insert-layer");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The layer",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("position",
-                                                      "position",
-                                                      "The layer position",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-image-insert-layer
    */
   procedure = gimp_procedure_new (image_insert_layer_invoker);
@@ -3797,41 +3552,6 @@ register_image_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-image-add-channel
-   */
-  procedure = gimp_procedure_new (image_add_channel_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-add-channel");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-add-channel",
-                                     "Deprecated: Use 'gimp-image-insert-channel' instead.",
-                                     "Deprecated: Use 'gimp-image-insert-channel' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-image-insert-channel");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_channel_id ("channel",
-                                                           "channel",
-                                                           "The channel",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("position",
-                                                      "position",
-                                                      "The channel position",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-image-insert-channel
    */
   procedure = gimp_procedure_new (image_insert_channel_invoker);
@@ -3952,41 +3672,6 @@ register_image_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-image-add-vectors
-   */
-  procedure = gimp_procedure_new (image_add_vectors_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-add-vectors");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-add-vectors",
-                                     "Deprecated: Use 'gimp-image-insert-vectors' instead.",
-                                     "Deprecated: Use 'gimp-image-insert-vectors' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-image-insert-vectors");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("position",
-                                                      "position",
-                                                      "The vectors objects position",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-image-insert-vectors
    */
   procedure = gimp_procedure_new (image_insert_vectors_invoker);
@@ -4410,77 +4095,6 @@ register_image_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-image-add-layer-mask
-   */
-  procedure = gimp_procedure_new (image_add_layer_mask_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-add-layer-mask");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-add-layer-mask",
-                                     "Deprecated: Use 'gimp-layer-add-mask' instead.",
-                                     "Deprecated: Use 'gimp-layer-add-mask' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-layer-add-mask");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The layer to receive the mask",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_mask_id ("mask",
-                                                              "mask",
-                                                              "The mask to add to the layer",
-                                                              pdb->gimp, FALSE,
-                                                              GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-image-remove-layer-mask
-   */
-  procedure = gimp_procedure_new (image_remove_layer_mask_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-remove-layer-mask");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-remove-layer-mask",
-                                     "Deprecated: Use 'gimp-layer-remove-mask' instead.",
-                                     "Deprecated: Use 'gimp-layer-remove-mask' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-layer-remove-mask");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The layer from which to remove mask",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("mode",
-                                                  "mode",
-                                                  "Removal mode",
-                                                  GIMP_TYPE_MASK_APPLY_MODE,
-                                                  GIMP_MASK_APPLY,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-image-get-colormap
    */
   procedure = gimp_procedure_new (image_get_colormap_invoker);
diff --git a/app/pdb/image-transform-cmds.c b/app/pdb/image-transform-cmds.c
index 63081a6..1ba78e8 100644
--- a/app/pdb/image-transform-cmds.c
+++ b/app/pdb/image-transform-cmds.c
@@ -134,40 +134,6 @@ image_scale_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-image_scale_full_invoker (GimpProcedure         *procedure,
-                          Gimp                  *gimp,
-                          GimpContext           *context,
-                          GimpProgress          *progress,
-                          const GimpValueArray  *args,
-                          GError               **error)
-{
-  gboolean success = TRUE;
-  GimpImage *image;
-  gint32 new_width;
-  gint32 new_height;
-  gint32 interpolation;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  new_width = g_value_get_int (gimp_value_array_index (args, 1));
-  new_height = g_value_get_int (gimp_value_array_index (args, 2));
-  interpolation = g_value_get_enum (gimp_value_array_index (args, 3));
-
-  if (success)
-    {
-      if (progress)
-        gimp_progress_start (progress, FALSE, _("Scaling"));
-
-      gimp_image_scale (image, new_width, new_height, interpolation, progress);
-
-      if (progress)
-        gimp_progress_end (progress);
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 image_crop_invoker (GimpProcedure         *procedure,
                     Gimp                  *gimp,
                     GimpContext           *context,
@@ -370,48 +336,6 @@ register_image_transform_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-image-scale-full
-   */
-  procedure = gimp_procedure_new (image_scale_full_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-image-scale-full");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-image-scale-full",
-                                     "Deprecated: Use 'gimp-image-scale' instead.",
-                                     "Deprecated: Use 'gimp-image-scale' instead.",
-                                     "Sven Neumann <sven gimp org>",
-                                     "Sven Neumann",
-                                     "2008",
-                                     "gimp-image-scale");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("new-width",
-                                                      "new width",
-                                                      "New image width",
-                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("new-height",
-                                                      "new height",
-                                                      "New image height",
-                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("interpolation",
-                                                  "interpolation",
-                                                  "Type of interpolation",
-                                                  GIMP_TYPE_INTERPOLATION_TYPE,
-                                                  GIMP_INTERPOLATION_NONE,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-image-crop
    */
   procedure = gimp_procedure_new (image_crop_invoker);
diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c
index d38470a..3ef50df 100644
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@ -28,7 +28,7 @@
 #include "internal-procs.h"
 
 
-/* 840 procedures registered total */
+/* 739 procedures registered total */
 
 void
 internal_procs_init (GimpPDB *pdb)
@@ -40,14 +40,12 @@ internal_procs_init (GimpPDB *pdb)
   register_brushes_procs (pdb);
   register_buffer_procs (pdb);
   register_channel_procs (pdb);
-  register_color_procs (pdb);
   register_context_procs (pdb);
   register_debug_procs (pdb);
   register_display_procs (pdb);
   register_drawable_procs (pdb);
   register_drawable_color_procs (pdb);
   register_drawable_edit_procs (pdb);
-  register_drawable_transform_procs (pdb);
   register_dynamics_procs (pdb);
   register_edit_procs (pdb);
   register_fileops_procs (pdb);
@@ -77,7 +75,6 @@ internal_procs_init (GimpPDB *pdb)
   register_palette_procs (pdb);
   register_palette_select_procs (pdb);
   register_palettes_procs (pdb);
-  register_paths_procs (pdb);
   register_pattern_procs (pdb);
   register_pattern_select_procs (pdb);
   register_patterns_procs (pdb);
@@ -86,10 +83,8 @@ internal_procs_init (GimpPDB *pdb)
   register_procedural_db_procs (pdb);
   register_progress_procs (pdb);
   register_selection_procs (pdb);
-  register_selection_tools_procs (pdb);
   register_text_layer_procs (pdb);
   register_text_tool_procs (pdb);
-  register_transform_tools_procs (pdb);
   register_unit_procs (pdb);
   register_vectors_procs (pdb);
 }
diff --git a/app/pdb/internal-procs.h b/app/pdb/internal-procs.h
index ff66116..4d8c937 100644
--- a/app/pdb/internal-procs.h
+++ b/app/pdb/internal-procs.h
@@ -29,14 +29,12 @@ void   register_brush_select_procs        (GimpPDB *pdb);
 void   register_brushes_procs             (GimpPDB *pdb);
 void   register_buffer_procs              (GimpPDB *pdb);
 void   register_channel_procs             (GimpPDB *pdb);
-void   register_color_procs               (GimpPDB *pdb);
 void   register_context_procs             (GimpPDB *pdb);
 void   register_debug_procs               (GimpPDB *pdb);
 void   register_display_procs             (GimpPDB *pdb);
 void   register_drawable_procs            (GimpPDB *pdb);
 void   register_drawable_color_procs      (GimpPDB *pdb);
 void   register_drawable_edit_procs       (GimpPDB *pdb);
-void   register_drawable_transform_procs  (GimpPDB *pdb);
 void   register_dynamics_procs            (GimpPDB *pdb);
 void   register_edit_procs                (GimpPDB *pdb);
 void   register_fileops_procs             (GimpPDB *pdb);
@@ -66,7 +64,6 @@ void   register_paint_tools_procs         (GimpPDB *pdb);
 void   register_palette_procs             (GimpPDB *pdb);
 void   register_palette_select_procs      (GimpPDB *pdb);
 void   register_palettes_procs            (GimpPDB *pdb);
-void   register_paths_procs               (GimpPDB *pdb);
 void   register_pattern_procs             (GimpPDB *pdb);
 void   register_pattern_select_procs      (GimpPDB *pdb);
 void   register_patterns_procs            (GimpPDB *pdb);
@@ -75,10 +72,8 @@ void   register_plug_in_compat_procs      (GimpPDB *pdb);
 void   register_procedural_db_procs       (GimpPDB *pdb);
 void   register_progress_procs            (GimpPDB *pdb);
 void   register_selection_procs           (GimpPDB *pdb);
-void   register_selection_tools_procs     (GimpPDB *pdb);
 void   register_text_layer_procs          (GimpPDB *pdb);
 void   register_text_tool_procs           (GimpPDB *pdb);
-void   register_transform_tools_procs     (GimpPDB *pdb);
 void   register_unit_procs                (GimpPDB *pdb);
 void   register_vectors_procs             (GimpPDB *pdb);
 
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index b63b6d9..462f955 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -418,53 +418,6 @@ layer_scale_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-layer_scale_full_invoker (GimpProcedure         *procedure,
-                          Gimp                  *gimp,
-                          GimpContext           *context,
-                          GimpProgress          *progress,
-                          const GimpValueArray  *args,
-                          GError               **error)
-{
-  gboolean success = TRUE;
-  GimpLayer *layer;
-  gint32 new_width;
-  gint32 new_height;
-  gboolean local_origin;
-  gint32 interpolation;
-
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
-  new_width = g_value_get_int (gimp_value_array_index (args, 1));
-  new_height = g_value_get_int (gimp_value_array_index (args, 2));
-  local_origin = g_value_get_boolean (gimp_value_array_index (args, 3));
-  interpolation = g_value_get_enum (gimp_value_array_index (args, 4));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL,
-                                     GIMP_PDB_ITEM_CONTENT | GIMP_PDB_ITEM_POSITION,
-                                     error))
-        {
-          if (progress)
-            gimp_progress_start (progress, FALSE, _("Scaling"));
-
-          gimp_item_scale_by_origin (GIMP_ITEM (layer), new_width, new_height,
-                                     interpolation, progress,
-                                     local_origin);
-
-          if (progress)
-            gimp_progress_end (progress);
-        }
-      else
-        {
-          success = FALSE;
-        }
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 layer_resize_invoker (GimpProcedure         *procedure,
                       Gimp                  *gimp,
                       GimpContext           *context,
@@ -528,45 +481,6 @@ layer_resize_to_image_size_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-layer_translate_invoker (GimpProcedure         *procedure,
-                         Gimp                  *gimp,
-                         GimpContext           *context,
-                         GimpProgress          *progress,
-                         const GimpValueArray  *args,
-                         GError               **error)
-{
-  gboolean success = TRUE;
-  GimpLayer *layer;
-  gint32 offx;
-  gint32 offy;
-
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
-  offx = g_value_get_int (gimp_value_array_index (args, 1));
-  offy = g_value_get_int (gimp_value_array_index (args, 2));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_modifiable (GIMP_ITEM (layer),
-                                       GIMP_PDB_ITEM_POSITION, error))
-        {
-          if (gimp_item_get_linked (GIMP_ITEM (layer)))
-            {
-              gimp_item_linked_translate (GIMP_ITEM (layer), offx, offy, TRUE);
-            }
-          else
-            {
-              gimp_item_translate (GIMP_ITEM (layer), offx, offy, TRUE);
-            }
-        }
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 layer_set_offsets_invoker (GimpProcedure         *procedure,
                            Gimp                  *gimp,
                            GimpContext           *context,
@@ -1626,54 +1540,6 @@ register_layer_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-layer-scale-full
-   */
-  procedure = gimp_procedure_new (layer_scale_full_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-layer-scale-full");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-layer-scale-full",
-                                     "Deprecated: Use 'gimp-layer-scale' instead.",
-                                     "Deprecated: Use 'gimp-layer-scale' instead.",
-                                     "Sven Neumann <sven gimp org>",
-                                     "Sven Neumann",
-                                     "2008",
-                                     "gimp-layer-scale");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The layer",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("new-width",
-                                                      "new width",
-                                                      "New layer width",
-                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("new-height",
-                                                      "new height",
-                                                      "New layer height",
-                                                      1, GIMP_MAX_IMAGE_SIZE, 1,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("local-origin",
-                                                     "local origin",
-                                                     "Use a local origin (as opposed to the image origin)",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("interpolation",
-                                                  "interpolation",
-                                                  "Type of interpolation",
-                                                  GIMP_TYPE_INTERPOLATION_TYPE,
-                                                  GIMP_INTERPOLATION_NONE,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-layer-resize
    */
   procedure = gimp_procedure_new (layer_resize_invoker);
@@ -1744,43 +1610,6 @@ register_layer_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-layer-translate
-   */
-  procedure = gimp_procedure_new (layer_translate_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-layer-translate");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-layer-translate",
-                                     "Translate the layer by the specified offsets.",
-                                     "This procedure translates the layer by the amounts specified in the x 
and y arguments. These can be negative, and are considered offsets from the current position. This command 
only works if the layer has been added to an image. All additional layers contained in the image which have 
the linked flag set to TRUE w ill also be translated by the specified offsets.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-item-transform-translate' instead.",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "Spencer Kimball & Peter Mattis",
-                                     "1995-1996",
-                                     "gimp-item-transform-translate");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The layer",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("offx",
-                                                      "offx",
-                                                      "Offset in x direction",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("offy",
-                                                      "offy",
-                                                      "Offset in y direction",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-layer-set-offsets
    */
   procedure = gimp_procedure_new (layer_set_offsets_invoker);
diff --git a/app/pdb/palettes-cmds.c b/app/pdb/palettes-cmds.c
index b179fdf..1c0bde0 100644
--- a/app/pdb/palettes-cmds.c
+++ b/app/pdb/palettes-cmds.c
@@ -19,15 +19,12 @@
 
 #include "config.h"
 
-#include <cairo.h>
 #include <string.h>
 
 #include <gegl.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "libgimpcolor/gimpcolor.h"
-
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
@@ -92,99 +89,6 @@ palettes_get_list_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-palettes_get_palette_invoker (GimpProcedure         *procedure,
-                              Gimp                  *gimp,
-                              GimpContext           *context,
-                              GimpProgress          *progress,
-                              const GimpValueArray  *args,
-                              GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  gchar *name = NULL;
-  gint32 num_colors = 0;
-
-  GimpPalette *palette = gimp_context_get_palette (context);
-
-  if (palette)
-    {
-      name       = g_strdup (gimp_object_get_name (palette));
-      num_colors = gimp_palette_get_n_colors (palette);
-    }
-  else
-    success = FALSE;
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), name);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), num_colors);
-    }
-
-  return return_vals;
-}
-
-static GimpValueArray *
-palettes_get_palette_entry_invoker (GimpProcedure         *procedure,
-                                    Gimp                  *gimp,
-                                    GimpContext           *context,
-                                    GimpProgress          *progress,
-                                    const GimpValueArray  *args,
-                                    GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  const gchar *name;
-  gint32 entry_num;
-  gchar *actual_name = NULL;
-  gint32 num_colors = 0;
-  GimpRGB color = { 0.0, 0.0, 0.0, 1.0 };
-
-  name = g_value_get_string (gimp_value_array_index (args, 0));
-  entry_num = g_value_get_int (gimp_value_array_index (args, 1));
-
-  if (success)
-    {
-      GimpPalette *palette;
-
-      if (name && strlen (name))
-        palette = gimp_pdb_get_palette (gimp, name, FALSE, error);
-      else
-        palette = gimp_context_get_palette (context);
-
-      if (palette)
-        {
-          GimpPaletteEntry *entry = gimp_palette_get_entry (palette, entry_num);
-
-          if (entry)
-            {
-              actual_name = g_strdup (gimp_object_get_name (palette));
-              num_colors  = gimp_palette_get_n_colors (palette);
-              color       = entry->color;
-            }
-          else
-            success = FALSE;
-        }
-      else
-        success = FALSE;
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), num_colors);
-      gimp_value_set_rgb (gimp_value_array_index (return_vals, 3), &color);
-    }
-
-  return return_vals;
-}
-
 void
 register_palettes_procs (GimpPDB *pdb)
 {
@@ -241,84 +145,4 @@ register_palettes_procs (GimpPDB *pdb)
                                                                  GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-palettes-get-palette
-   */
-  procedure = gimp_procedure_new (palettes_get_palette_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-palettes-get-palette");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-palettes-get-palette",
-                                     "Deprecated: Use 'gimp-context-get-palette' instead.",
-                                     "Deprecated: Use 'gimp-context-get-palette' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-context-get-palette");
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("name",
-                                                           "name",
-                                                           "The palette name",
-                                                           FALSE, TRUE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("num-colors",
-                                                          "num colors",
-                                                          "The palette num_colors",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-palettes-get-palette-entry
-   */
-  procedure = gimp_procedure_new (palettes_get_palette_entry_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-palettes-get-palette-entry");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-palettes-get-palette-entry",
-                                     "Deprecated: Use 'gimp-palette-entry-get-color' instead.",
-                                     "Deprecated: Use 'gimp-palette-entry-get-color' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-palette-entry-get-color");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The palette name (\"\" means currently active 
palette)",
-                                                       FALSE, TRUE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("entry-num",
-                                                      "entry num",
-                                                      "The entry to retrieve",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("actual-name",
-                                                           "actual name",
-                                                           "The palette name",
-                                                           FALSE, FALSE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("num-colors",
-                                                          "num colors",
-                                                          "The palette num_colors",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_rgb ("color",
-                                                        "color",
-                                                        "The color requested",
-                                                        FALSE,
-                                                        NULL,
-                                                        GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/patterns-cmds.c b/app/pdb/patterns-cmds.c
index a1864a9..ad3898d 100644
--- a/app/pdb/patterns-cmds.c
+++ b/app/pdb/patterns-cmds.c
@@ -90,102 +90,6 @@ patterns_get_list_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-patterns_get_pattern_invoker (GimpProcedure         *procedure,
-                              Gimp                  *gimp,
-                              GimpContext           *context,
-                              GimpProgress          *progress,
-                              const GimpValueArray  *args,
-                              GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  gchar *name = NULL;
-  gint32 width = 0;
-  gint32 height = 0;
-
-  GimpPattern *pattern = gimp_context_get_pattern (context);
-
-  if (pattern)
-    {
-      name   = g_strdup (gimp_object_get_name (pattern));
-      width  = gimp_temp_buf_get_width  (pattern->mask);
-      height = gimp_temp_buf_get_height (pattern->mask);
-    }
-  else
-    success = FALSE;
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), name);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
-      g_value_set_int (gimp_value_array_index (return_vals, 3), height);
-    }
-
-  return return_vals;
-}
-
-static GimpValueArray *
-patterns_get_pattern_data_invoker (GimpProcedure         *procedure,
-                                   Gimp                  *gimp,
-                                   GimpContext           *context,
-                                   GimpProgress          *progress,
-                                   const GimpValueArray  *args,
-                                   GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  const gchar *name;
-  gchar *actual_name = NULL;
-  gint32 width = 0;
-  gint32 height = 0;
-  gint32 mask_bpp = 0;
-  gint32 length = 0;
-  guint8 *mask_data = NULL;
-
-  name = g_value_get_string (gimp_value_array_index (args, 0));
-
-  if (success)
-    {
-      GimpPattern *pattern;
-
-      if (name && strlen (name))
-        pattern = gimp_pdb_get_pattern (gimp, name, error);
-      else
-        pattern = gimp_context_get_pattern (context);
-
-      if (pattern)
-        {
-          actual_name = g_strdup (gimp_object_get_name (pattern));
-          width       = gimp_temp_buf_get_width  (pattern->mask);
-          height      = gimp_temp_buf_get_height (pattern->mask);
-          mask_bpp    = babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (pattern->mask));
-          length      = gimp_temp_buf_get_data_size (pattern->mask);
-          mask_data   = g_memdup (gimp_temp_buf_get_data (pattern->mask), length);
-        }
-      else
-        success = FALSE;
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_take_string (gimp_value_array_index (return_vals, 1), actual_name);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), width);
-      g_value_set_int (gimp_value_array_index (return_vals, 3), height);
-      g_value_set_int (gimp_value_array_index (return_vals, 4), mask_bpp);
-      g_value_set_int (gimp_value_array_index (return_vals, 5), length);
-      gimp_value_take_int8array (gimp_value_array_index (return_vals, 6), mask_data, length);
-    }
-
-  return return_vals;
-}
-
 void
 register_patterns_procs (GimpPDB *pdb)
 {
@@ -242,100 +146,4 @@ register_patterns_procs (GimpPDB *pdb)
                                                                  GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-patterns-get-pattern
-   */
-  procedure = gimp_procedure_new (patterns_get_pattern_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-patterns-get-pattern");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-patterns-get-pattern",
-                                     "Deprecated: Use 'gimp-context-get-pattern' instead.",
-                                     "Deprecated: Use 'gimp-context-get-pattern' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-context-get-pattern");
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("name",
-                                                           "name",
-                                                           "The pattern name",
-                                                           FALSE, FALSE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("width",
-                                                          "width",
-                                                          "The pattern width",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("height",
-                                                          "height",
-                                                          "The pattern height",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-patterns-get-pattern-data
-   */
-  procedure = gimp_procedure_new (patterns_get_pattern_data_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-patterns-get-pattern-data");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-patterns-get-pattern-data",
-                                     "Deprecated: Use 'gimp-pattern-get-pixels' instead.",
-                                     "Deprecated: Use 'gimp-pattern-get-pixels' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-pattern-get-pixels");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The pattern name (\"\" means currently active 
pattern)",
-                                                       FALSE, TRUE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string ("actual-name",
-                                                           "actual name",
-                                                           "The pattern name",
-                                                           FALSE, FALSE, FALSE,
-                                                           NULL,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("width",
-                                                          "width",
-                                                          "The pattern width",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("height",
-                                                          "height",
-                                                          "The pattern height",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("mask-bpp",
-                                                          "mask bpp",
-                                                          "Pattern bytes per pixel",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("length",
-                                                          "length",
-                                                          "Length of pattern mask data",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int8_array ("mask-data",
-                                                               "mask data",
-                                                               "The pattern mask data",
-                                                               GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/selection-cmds.c b/app/pdb/selection-cmds.c
index 43f9d97..4b57a0e 100644
--- a/app/pdb/selection-cmds.c
+++ b/app/pdb/selection-cmds.c
@@ -446,60 +446,6 @@ selection_flood_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-selection_layer_alpha_invoker (GimpProcedure         *procedure,
-                               Gimp                  *gimp,
-                               GimpContext           *context,
-                               GimpProgress          *progress,
-                               const GimpValueArray  *args,
-                               GError               **error)
-{
-  gboolean success = TRUE;
-  GimpLayer *layer;
-
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, 0, error))
-        gimp_item_to_selection (GIMP_ITEM (layer),
-                                GIMP_CHANNEL_OP_REPLACE,
-                                TRUE, FALSE, 0.0, 0.0);
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
-selection_load_invoker (GimpProcedure         *procedure,
-                        Gimp                  *gimp,
-                        GimpContext           *context,
-                        GimpProgress          *progress,
-                        const GimpValueArray  *args,
-                        GError               **error)
-{
-  gboolean success = TRUE;
-  GimpChannel *channel;
-
-  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), NULL, 0, error))
-        gimp_item_to_selection (GIMP_ITEM (channel),
-                                GIMP_CHANNEL_OP_REPLACE,
-                                TRUE, FALSE, 0.0, 0.0);
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 selection_save_invoker (GimpProcedure         *procedure,
                         Gimp                  *gimp,
                         GimpContext           *context,
@@ -540,35 +486,6 @@ selection_save_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-selection_combine_invoker (GimpProcedure         *procedure,
-                           Gimp                  *gimp,
-                           GimpContext           *context,
-                           GimpProgress          *progress,
-                           const GimpValueArray  *args,
-                           GError               **error)
-{
-  gboolean success = TRUE;
-  GimpChannel *channel;
-  gint32 operation;
-
-  channel = gimp_value_get_channel (gimp_value_array_index (args, 0), gimp);
-  operation = g_value_get_enum (gimp_value_array_index (args, 1));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), NULL, 0, error))
-        gimp_item_to_selection (GIMP_ITEM (channel),
-                                operation,
-                                TRUE, FALSE, 0.0, 0.0);
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
 void
 register_selection_procs (GimpPDB *pdb)
 {
@@ -1005,52 +922,6 @@ register_selection_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-selection-layer-alpha
-   */
-  procedure = gimp_procedure_new (selection_layer_alpha_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-selection-layer-alpha");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-selection-layer-alpha",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-image-select-item");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "Layer with alpha",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-selection-load
-   */
-  procedure = gimp_procedure_new (selection_load_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-selection-load");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-selection-load",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-image-select-item");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_channel_id ("channel",
-                                                           "channel",
-                                                           "The channel",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-selection-save
    */
   procedure = gimp_procedure_new (selection_save_invoker);
@@ -1078,34 +949,4 @@ register_selection_procs (GimpPDB *pdb)
                                                                GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-selection-combine
-   */
-  procedure = gimp_procedure_new (selection_combine_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-selection-combine");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-selection-combine",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-image-select-item");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_channel_id ("channel",
-                                                           "channel",
-                                                           "The channel",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("operation",
-                                                  "operation",
-                                                  "The selection operation",
-                                                  GIMP_TYPE_CHANNEL_OPS,
-                                                  GIMP_CHANNEL_OP_ADD,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/text-layer-cmds.c b/app/pdb/text-layer-cmds.c
index 95c749e..63d5ac7 100644
--- a/app/pdb/text-layer-cmds.c
+++ b/app/pdb/text-layer-cmds.c
@@ -1135,82 +1135,6 @@ text_layer_resize_invoker (GimpProcedure         *procedure,
                                            error ? *error : NULL);
 }
 
-static GimpValueArray *
-text_layer_get_hinting_invoker (GimpProcedure         *procedure,
-                                Gimp                  *gimp,
-                                GimpContext           *context,
-                                GimpProgress          *progress,
-                                const GimpValueArray  *args,
-                                GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  GimpLayer *layer;
-  gboolean hinting = FALSE;
-  gboolean autohint = FALSE;
-
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
-
-  if (success)
-    {
-      if (gimp_pdb_layer_is_text_layer (layer, 0, error))
-        {
-          g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
-                        "hinting", &hinting,
-                        NULL);
-        }
-      else
-        {
-          success = FALSE;
-        }
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_set_boolean (gimp_value_array_index (return_vals, 1), hinting);
-      g_value_set_boolean (gimp_value_array_index (return_vals, 2), autohint);
-    }
-
-  return return_vals;
-}
-
-static GimpValueArray *
-text_layer_set_hinting_invoker (GimpProcedure         *procedure,
-                                Gimp                  *gimp,
-                                GimpContext           *context,
-                                GimpProgress          *progress,
-                                const GimpValueArray  *args,
-                                GError               **error)
-{
-  gboolean success = TRUE;
-  GimpLayer *layer;
-  gboolean hinting;
-
-  layer = gimp_value_get_layer (gimp_value_array_index (args, 0), gimp);
-  hinting = g_value_get_boolean (gimp_value_array_index (args, 1));
-
-  if (success)
-    {
-      if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
-        {
-          gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
-                               _("Set text layer attribute"),
-                               "hinting", hinting,
-                               NULL);
-        }
-      else
-        {
-          success = FALSE;
-        }
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
 void
 register_text_layer_procs (GimpPDB *pdb)
 {
@@ -2121,76 +2045,4 @@ register_text_layer_procs (GimpPDB *pdb)
                                                     GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-text-layer-get-hinting
-   */
-  procedure = gimp_procedure_new (text_layer_get_hinting_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-text-layer-get-hinting");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-text-layer-get-hinting",
-                                     "Deprecated: Use 'gimp-text-layer-get-hint-style' instead.",
-                                     "Deprecated: Use 'gimp-text-layer-get-hint-style' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-text-layer-get-hint-style");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The text layer",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_boolean ("hinting",
-                                                         "hinting",
-                                                         "A flag which is true if hinting is used on the 
font.",
-                                                         FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_boolean ("autohint",
-                                                         "autohint",
-                                                         "A flag which is true if the text layer is forced 
to use the autohinter from FreeType.",
-                                                         FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-text-layer-set-hinting
-   */
-  procedure = gimp_procedure_new (text_layer_set_hinting_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-text-layer-set-hinting");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-text-layer-set-hinting",
-                                     "Enable/disable the use of hinting in a text layer.",
-                                     "This procedure enables or disables hinting on the text of a text 
layer. If you enable 'auto-hint', FreeType\'s automatic hinter will be used and hinting information from the 
font will be ignored.\n"
-                                     "\n"
-                                     "Deprecated: Use 'gimp-text-layer-set-hint-style' instead.",
-                                     "Marcus Heese <heese cip ifi lmu de>",
-                                     "Marcus Heese",
-                                     "2008",
-                                     "gimp-text-layer-set-hint-style");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_layer_id ("layer",
-                                                         "layer",
-                                                         "The text layer",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("hinting",
-                                                     "hinting",
-                                                     "Enable/disable the use of hinting on the text",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("autohint",
-                                                     "autohint",
-                                                     "Force the use of the autohinter provided through 
FreeType",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/text-tool-cmds.c b/app/pdb/text-tool-cmds.c
index 8b130e2..0052998 100644
--- a/app/pdb/text-tool-cmds.c
+++ b/app/pdb/text-tool-cmds.c
@@ -148,113 +148,6 @@ text_get_extents_fontname_invoker (GimpProcedure         *procedure,
   return return_vals;
 }
 
-static GimpValueArray *
-text_invoker (GimpProcedure         *procedure,
-              Gimp                  *gimp,
-              GimpContext           *context,
-              GimpProgress          *progress,
-              const GimpValueArray  *args,
-              GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  GimpImage *image;
-  GimpDrawable *drawable;
-  gdouble x;
-  gdouble y;
-  const gchar *text;
-  gint32 border;
-  gboolean antialias;
-  gdouble size;
-  const gchar *family;
-  GimpLayer *text_layer = NULL;
-
-  image = gimp_value_get_image (gimp_value_array_index (args, 0), gimp);
-  drawable = gimp_value_get_drawable (gimp_value_array_index (args, 1), gimp);
-  x = g_value_get_double (gimp_value_array_index (args, 2));
-  y = g_value_get_double (gimp_value_array_index (args, 3));
-  text = g_value_get_string (gimp_value_array_index (args, 4));
-  border = g_value_get_int (gimp_value_array_index (args, 5));
-  antialias = g_value_get_boolean (gimp_value_array_index (args, 6));
-  size = g_value_get_double (gimp_value_array_index (args, 7));
-  family = g_value_get_string (gimp_value_array_index (args, 10));
-
-  if (success)
-    {
-      if (drawable &&
-          (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), image,
-                                        GIMP_PDB_ITEM_CONTENT, error) ||
-           ! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)))
-        success = FALSE;
-
-      if (success)
-        {
-          gchar *real_fontname = g_strdup_printf ("%s %d", family, (gint) size);
-
-          text_layer = text_render (image, drawable, context,
-                                    x, y, real_fontname, text,
-                                    border, antialias);
-
-          g_free (real_fontname);
-        }
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    gimp_value_set_layer (gimp_value_array_index (return_vals, 1), text_layer);
-
-  return return_vals;
-}
-
-static GimpValueArray *
-text_get_extents_invoker (GimpProcedure         *procedure,
-                          Gimp                  *gimp,
-                          GimpContext           *context,
-                          GimpProgress          *progress,
-                          const GimpValueArray  *args,
-                          GError               **error)
-{
-  gboolean success = TRUE;
-  GimpValueArray *return_vals;
-  const gchar *text;
-  gdouble size;
-  const gchar *family;
-  gint32 width = 0;
-  gint32 height = 0;
-  gint32 ascent = 0;
-  gint32 descent = 0;
-
-  text = g_value_get_string (gimp_value_array_index (args, 0));
-  size = g_value_get_double (gimp_value_array_index (args, 1));
-  family = g_value_get_string (gimp_value_array_index (args, 4));
-
-  if (success)
-    {
-      gchar *real_fontname = g_strdup_printf ("%s %d", family, (gint) size);
-
-      success = text_get_extents (real_fontname, text,
-                                  &width, &height,
-                                  &ascent, &descent);
-
-      g_free (real_fontname);
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_set_int (gimp_value_array_index (return_vals, 1), width);
-      g_value_set_int (gimp_value_array_index (return_vals, 2), height);
-      g_value_set_int (gimp_value_array_index (return_vals, 3), ascent);
-      g_value_set_int (gimp_value_array_index (return_vals, 4), descent);
-    }
-
-  return return_vals;
-}
-
 void
 register_text_tool_procs (GimpPDB *pdb)
 {
@@ -413,256 +306,4 @@ register_text_tool_procs (GimpPDB *pdb)
                                                           GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-text
-   */
-  procedure = gimp_procedure_new (text_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-text");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-text",
-                                     "Deprecated: Use 'gimp-text-fontname' instead.",
-                                     "Deprecated: Use 'gimp-text-fontname' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-text-fontname");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_image_id ("image",
-                                                         "image",
-                                                         "The image",
-                                                         pdb->gimp, FALSE,
-                                                         GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The affected drawable: (-1 for a new text 
layer)",
-                                                            pdb->gimp, TRUE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("x",
-                                                    "x",
-                                                    "The x coordinate for the left of the text bounding box",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("y",
-                                                    "y",
-                                                    "The y coordinate for the top of the text bounding box",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("text",
-                                                       "text",
-                                                       "The text to generate (in UTF-8 encoding)",
-                                                       FALSE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("border",
-                                                      "border",
-                                                      "The size of the border",
-                                                      -1, G_MAXINT32, -1,
-                                                      GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("antialias",
-                                                     "antialias",
-                                                     "Antialiasing",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("size",
-                                                    "size",
-                                                    "The size of text in either pixels or points",
-                                                    0, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("size-type",
-                                                  "size type",
-                                                  "The units of specified size",
-                                                  GIMP_TYPE_SIZE_TYPE,
-                                                  GIMP_PIXELS,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("foundry",
-                                                       "foundry",
-                                                       "The font foundry",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("family",
-                                                       "family",
-                                                       "The font family",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("weight",
-                                                       "weight",
-                                                       "The font weight",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("slant",
-                                                       "slant",
-                                                       "The font slant",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("set-width",
-                                                       "set width",
-                                                       "The font set-width",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("spacing",
-                                                       "spacing",
-                                                       "The font spacing",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("registry",
-                                                       "registry",
-                                                       "The font registry",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("encoding",
-                                                       "encoding",
-                                                       "The font encoding",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_layer_id ("text-layer",
-                                                             "text layer",
-                                                             "The new text layer or -1 if no layer was 
created.",
-                                                             pdb->gimp, FALSE,
-                                                             GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-text-get-extents
-   */
-  procedure = gimp_procedure_new (text_get_extents_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-text-get-extents");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-text-get-extents",
-                                     "Deprecated: Use 'gimp-text-get-extents-fontname' instead.",
-                                     "Deprecated: Use 'gimp-text-get-extents-fontname' instead.",
-                                     "",
-                                     "",
-                                     "",
-                                     "gimp-text-get-extents-fontname");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("text",
-                                                       "text",
-                                                       "The text to generate (in UTF-8 encoding)",
-                                                       FALSE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("size",
-                                                    "size",
-                                                    "The size of text in either pixels or points",
-                                                    0, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("size-type",
-                                                  "size type",
-                                                  "The units of specified size",
-                                                  GIMP_TYPE_SIZE_TYPE,
-                                                  GIMP_PIXELS,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("foundry",
-                                                       "foundry",
-                                                       "The font foundry",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("family",
-                                                       "family",
-                                                       "The font family",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("weight",
-                                                       "weight",
-                                                       "The font weight",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("slant",
-                                                       "slant",
-                                                       "The font slant",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("set-width",
-                                                       "set width",
-                                                       "The font set-width",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("spacing",
-                                                       "spacing",
-                                                       "The font spacing",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("registry",
-                                                       "registry",
-                                                       "The font registry",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("encoding",
-                                                       "encoding",
-                                                       "The font encoding",
-                                                       TRUE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("width",
-                                                          "width",
-                                                          "The width of the specified font",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("height",
-                                                          "height",
-                                                          "The height of the specified font",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("ascent",
-                                                          "ascent",
-                                                          "The ascent of the specified font",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("descent",
-                                                          "descent",
-                                                          "The descent of the specified font",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/app/pdb/vectors-cmds.c b/app/pdb/vectors-cmds.c
index 0967f9e..54a0fad 100644
--- a/app/pdb/vectors-cmds.c
+++ b/app/pdb/vectors-cmds.c
@@ -1100,46 +1100,6 @@ vectors_bezier_stroke_new_ellipse_invoker (GimpProcedure         *procedure,
 }
 
 static GimpValueArray *
-vectors_to_selection_invoker (GimpProcedure         *procedure,
-                              Gimp                  *gimp,
-                              GimpContext           *context,
-                              GimpProgress          *progress,
-                              const GimpValueArray  *args,
-                              GError               **error)
-{
-  gboolean success = TRUE;
-  GimpVectors *vectors;
-  gint32 operation;
-  gboolean antialias;
-  gboolean feather;
-  gdouble feather_radius_x;
-  gdouble feather_radius_y;
-
-  vectors = gimp_value_get_vectors (gimp_value_array_index (args, 0), gimp);
-  operation = g_value_get_enum (gimp_value_array_index (args, 1));
-  antialias = g_value_get_boolean (gimp_value_array_index (args, 2));
-  feather = g_value_get_boolean (gimp_value_array_index (args, 3));
-  feather_radius_x = g_value_get_double (gimp_value_array_index (args, 4));
-  feather_radius_y = g_value_get_double (gimp_value_array_index (args, 5));
-
-  if (success)
-    {
-      if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), NULL, 0, error))
-        gimp_item_to_selection (GIMP_ITEM (vectors),
-                                operation,
-                                antialias,
-                                feather,
-                                feather_radius_x,
-                                feather_radius_y);
-      else
-        success = FALSE;
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GimpValueArray *
 vectors_import_from_file_invoker (GimpProcedure         *procedure,
                                   Gimp                  *gimp,
                                   GimpContext           *context,
@@ -2279,60 +2239,6 @@ register_vectors_procs (GimpPDB *pdb)
   g_object_unref (procedure);
 
   /*
-   * gimp-vectors-to-selection
-   */
-  procedure = gimp_procedure_new (vectors_to_selection_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-vectors-to-selection");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-vectors-to-selection",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "Deprecated: Use 'gimp-image-select-item' instead.",
-                                     "Simon Budig",
-                                     "Simon Budig",
-                                     "2006",
-                                     "gimp-image-select-item");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object to render to the selection",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("operation",
-                                                  "operation",
-                                                  "The desired operation with current selection",
-                                                  GIMP_TYPE_CHANNEL_OPS,
-                                                  GIMP_CHANNEL_OP_ADD,
-                                                  GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("antialias",
-                                                     "antialias",
-                                                     "Antialias selection.",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_boolean ("feather",
-                                                     "feather",
-                                                     "Feather selection.",
-                                                     FALSE,
-                                                     GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("feather-radius-x",
-                                                    "feather radius x",
-                                                    "Feather radius x.",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("feather-radius-y",
-                                                    "feather radius y",
-                                                    "Feather radius y.",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-vectors-import-from-file
    */
   procedure = gimp_procedure_new (vectors_import_from_file_invoker);
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 83cb357..b98a0aa 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -97,14 +97,12 @@ PDB_WRAPPERS_C = \
        gimpbrushselect_pdb.c           \
        gimpbuffer_pdb.c                \
        gimpchannel_pdb.c               \
-       gimpcolor_pdb.c                 \
        gimpcontext_pdb.c               \
        gimpdebug_pdb.c                 \
        gimpdisplay_pdb.c               \
        gimpdrawable_pdb.c              \
        gimpdrawablecolor_pdb.c         \
        gimpdrawableedit_pdb.c          \
-       gimpdrawabletransform_pdb.c     \
        gimpdynamics_pdb.c              \
        gimpedit_pdb.c                  \
        gimpfileops_pdb.c               \
@@ -133,7 +131,6 @@ PDB_WRAPPERS_C = \
        gimppalette_pdb.c               \
        gimppalettes_pdb.c              \
        gimppaletteselect_pdb.c         \
-       gimppaths_pdb.c                 \
        gimppattern_pdb.c               \
        gimppatterns_pdb.c              \
        gimppatternselect_pdb.c         \
@@ -141,10 +138,8 @@ PDB_WRAPPERS_C = \
        gimpproceduraldb_pdb.c          \
        gimpprogress_pdb.c              \
        gimpselection_pdb.c             \
-       gimpselectiontools_pdb.c        \
        gimptextlayer_pdb.c             \
        gimptexttool_pdb.c              \
-       gimptransformtools_pdb.c        \
        gimpunit_pdb.c                  \
        gimpvectors_pdb.c
 
@@ -156,14 +151,12 @@ PDB_WRAPPERS_H = \
        gimpbrushselect_pdb.h           \
        gimpbuffer_pdb.h                \
        gimpchannel_pdb.h               \
-       gimpcolor_pdb.h                 \
        gimpcontext_pdb.h               \
        gimpdebug_pdb.h                 \
        gimpdisplay_pdb.h               \
        gimpdrawable_pdb.h              \
        gimpdrawablecolor_pdb.h         \
        gimpdrawableedit_pdb.h          \
-       gimpdrawabletransform_pdb.h     \
        gimpdynamics_pdb.h              \
        gimpedit_pdb.h                  \
        gimpfileops_pdb.h               \
@@ -192,7 +185,6 @@ PDB_WRAPPERS_H = \
        gimppalette_pdb.h               \
        gimppalettes_pdb.h              \
        gimppaletteselect_pdb.h         \
-       gimppaths_pdb.h                 \
        gimppattern_pdb.h               \
        gimppatterns_pdb.h              \
        gimppatternselect_pdb.h         \
@@ -200,10 +192,8 @@ PDB_WRAPPERS_H = \
        gimpproceduraldb_pdb.h          \
        gimpprogress_pdb.h              \
        gimpselection_pdb.h             \
-       gimpselectiontools_pdb.h        \
        gimptextlayer_pdb.h             \
        gimptexttool_pdb.h              \
-       gimptransformtools_pdb.h        \
        gimpunit_pdb.h                  \
        gimpvectors_pdb.h
 
diff --git a/libgimp/gimp.def b/libgimp/gimp.def
index cd858bf..ef28f44 100644
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@ -29,14 +29,10 @@ EXPORTS
        gimp_brush_set_spacing
        gimp_brush_set_spikes
        gimp_brushes_close_popup
-       gimp_brushes_get_brush
-       gimp_brushes_get_brush_data
        gimp_brushes_get_list
-       gimp_brushes_get_spacing
        gimp_brushes_popup
        gimp_brushes_refresh
        gimp_brushes_set_popup
-       gimp_brushes_set_spacing
        gimp_buffer_delete
        gimp_buffer_get_bytes
        gimp_buffer_get_height
@@ -44,8 +40,6 @@ EXPORTS
        gimp_buffer_get_width
        gimp_buffer_rename
        gimp_buffers_get_list
-       gimp_by_color_select
-       gimp_by_color_select_full
        gimp_channel_combine_masks
        gimp_channel_copy
        gimp_channel_get_color
@@ -111,7 +105,6 @@ EXPORTS
        gimp_context_get_sample_transparent
        gimp_context_get_stroke_method
        gimp_context_get_transform_direction
-       gimp_context_get_transform_recursion
        gimp_context_get_transform_resize
        gimp_context_list_paint_methods
        gimp_context_pop
@@ -174,7 +167,6 @@ EXPORTS
        gimp_context_set_sample_transparent
        gimp_context_set_stroke_method
        gimp_context_set_transform_direction
-       gimp_context_set_transform_recursion
        gimp_context_set_transform_resize
        gimp_context_swap_colors
        gimp_convert_dither_type_get_type
@@ -246,39 +238,17 @@ EXPORTS
        gimp_drawable_offset
        gimp_drawable_offsets
        gimp_drawable_posterize
-       gimp_drawable_set_image
        gimp_drawable_set_pixel
        gimp_drawable_threshold
-       gimp_drawable_transform_2d
-       gimp_drawable_transform_2d_default
-       gimp_drawable_transform_flip
-       gimp_drawable_transform_flip_default
-       gimp_drawable_transform_flip_simple
-       gimp_drawable_transform_matrix
-       gimp_drawable_transform_matrix_default
-       gimp_drawable_transform_perspective
-       gimp_drawable_transform_perspective_default
-       gimp_drawable_transform_rotate
-       gimp_drawable_transform_rotate_default
-       gimp_drawable_transform_rotate_simple
-       gimp_drawable_transform_scale
-       gimp_drawable_transform_scale_default
-       gimp_drawable_transform_shear
-       gimp_drawable_transform_shear_default
        gimp_drawable_type
        gimp_drawable_type_with_alpha
        gimp_drawable_update
        gimp_drawable_width
        gimp_dynamics_get_list
        gimp_dynamics_refresh
-       gimp_edit_blend
-       gimp_edit_bucket_fill
-       gimp_edit_bucket_fill_full
-       gimp_edit_clear
        gimp_edit_copy
        gimp_edit_copy_visible
        gimp_edit_cut
-       gimp_edit_fill
        gimp_edit_named_copy
        gimp_edit_named_copy_visible
        gimp_edit_named_cut
@@ -286,9 +256,6 @@ EXPORTS
        gimp_edit_named_paste_as_new_image
        gimp_edit_paste
        gimp_edit_paste_as_new_image
-       gimp_edit_stroke
-       gimp_edit_stroke_vectors
-       gimp_ellipse_select
        gimp_enums_get_type_names
        gimp_enums_init
        gimp_equalize
@@ -308,9 +275,7 @@ EXPORTS
        gimp_flip
        gimp_floating_sel_anchor
        gimp_floating_sel_attach
-       gimp_floating_sel_relax
        gimp_floating_sel_remove
-       gimp_floating_sel_rigor
        gimp_floating_sel_to_layer
        gimp_font_select_destroy
        gimp_font_select_new
@@ -319,9 +284,6 @@ EXPORTS
        gimp_fonts_popup
        gimp_fonts_refresh
        gimp_fonts_set_popup
-       gimp_free_select
-       gimp_fuzzy_select
-       gimp_fuzzy_select_full
        gimp_gamma
        gimp_get_color_configuration
        gimp_get_default_comment
@@ -373,12 +335,9 @@ EXPORTS
        gimp_gradient_select_destroy
        gimp_gradient_select_new
        gimp_gradients_close_popup
-       gimp_gradients_get_gradient_data
        gimp_gradients_get_list
        gimp_gradients_popup
        gimp_gradients_refresh
-       gimp_gradients_sample_custom
-       gimp_gradients_sample_uniform
        gimp_gradients_set_popup
        gimp_heal
        gimp_heal_default
@@ -386,11 +345,8 @@ EXPORTS
        gimp_histogram
        gimp_histogram_channel_get_type
        gimp_hue_saturation
-       gimp_image_add_channel
        gimp_image_add_hguide
-       gimp_image_add_layer
        gimp_image_add_sample_point
-       gimp_image_add_vectors
        gimp_image_add_vguide
        gimp_image_attach_parasite
        gimp_image_base_type
@@ -413,7 +369,6 @@ EXPORTS
        gimp_image_flatten
        gimp_image_flip
        gimp_image_floating_sel_attached_to
-       gimp_image_free_shadow
        gimp_image_freeze_channels
        gimp_image_freeze_layers
        gimp_image_freeze_vectors
@@ -494,7 +449,6 @@ EXPORTS
        gimp_image_resize_to_layers
        gimp_image_rotate
        gimp_image_scale
-       gimp_image_scale_full
        gimp_image_select_color
        gimp_image_select_contiguous_color
        gimp_image_select_ellipse
@@ -603,7 +557,6 @@ EXPORTS
        gimp_layer_resize
        gimp_layer_resize_to_image_size
        gimp_layer_scale
-       gimp_layer_scale_full
        gimp_layer_set_apply_mask
        gimp_layer_set_blend_space
        gimp_layer_set_composite_mode
@@ -614,7 +567,6 @@ EXPORTS
        gimp_layer_set_offsets
        gimp_layer_set_opacity
        gimp_layer_set_show_mask
-       gimp_layer_translate
        gimp_levels
        gimp_levels_auto
        gimp_levels_stretch
@@ -644,33 +596,15 @@ EXPORTS
        gimp_palette_set_columns
        gimp_palettes_close_popup
        gimp_palettes_get_list
-       gimp_palettes_get_palette
-       gimp_palettes_get_palette_entry
        gimp_palettes_popup
        gimp_palettes_refresh
        gimp_palettes_set_popup
-       gimp_path_delete
-       gimp_path_get_current
-       gimp_path_get_locked
-       gimp_path_get_point_at_dist
-       gimp_path_get_points
-       gimp_path_get_tattoo
-       gimp_path_import
-       gimp_path_list
-       gimp_path_set_current
-       gimp_path_set_locked
-       gimp_path_set_points
-       gimp_path_set_tattoo
-       gimp_path_stroke_current
-       gimp_path_to_selection
        gimp_pattern_get_info
        gimp_pattern_get_pixels
        gimp_pattern_select_destroy
        gimp_pattern_select_new
        gimp_patterns_close_popup
        gimp_patterns_get_list
-       gimp_patterns_get_pattern
-       gimp_patterns_get_pattern_data
        gimp_patterns_popup
        gimp_patterns_refresh
        gimp_patterns_set_popup
@@ -729,7 +663,6 @@ EXPORTS
        gimp_progress_update
        gimp_quit
        gimp_read_expect_msg
-       gimp_rect_select
        gimp_register_file_handler_mime
        gimp_register_file_handler_raw
        gimp_register_file_handler_uri
@@ -745,22 +678,18 @@ EXPORTS
        gimp_rgn_iterator_src
        gimp_rgn_iterator_src_dest
        gimp_rotate
-       gimp_round_rect_select
        gimp_run_procedure
        gimp_run_procedure2
        gimp_scale
        gimp_selection_all
        gimp_selection_border
        gimp_selection_bounds
-       gimp_selection_combine
        gimp_selection_feather
        gimp_selection_float
        gimp_selection_flood
        gimp_selection_grow
        gimp_selection_invert
        gimp_selection_is_empty
-       gimp_selection_layer_alpha
-       gimp_selection_load
        gimp_selection_none
        gimp_selection_save
        gimp_selection_sharpen
@@ -775,9 +704,7 @@ EXPORTS
        gimp_smudge
        gimp_smudge_default
        gimp_temp_name
-       gimp_text
        gimp_text_fontname
-       gimp_text_get_extents
        gimp_text_get_extents_fontname
        gimp_text_layer_get_antialias
        gimp_text_layer_get_base_direction
@@ -785,7 +712,6 @@ EXPORTS
        gimp_text_layer_get_font
        gimp_text_layer_get_font_size
        gimp_text_layer_get_hint_style
-       gimp_text_layer_get_hinting
        gimp_text_layer_get_indent
        gimp_text_layer_get_justification
        gimp_text_layer_get_kerning
@@ -802,7 +728,6 @@ EXPORTS
        gimp_text_layer_set_font
        gimp_text_layer_set_font_size
        gimp_text_layer_set_hint_style
-       gimp_text_layer_set_hinting
        gimp_text_layer_set_indent
        gimp_text_layer_set_justification
        gimp_text_layer_set_kerning
@@ -847,6 +772,5 @@ EXPORTS
        gimp_vectors_stroke_rotate
        gimp_vectors_stroke_scale
        gimp_vectors_stroke_translate
-       gimp_vectors_to_selection
        gimp_version
        gimp_wm_class
diff --git a/libgimp/gimp_pdb_headers.h b/libgimp/gimp_pdb_headers.h
index d18ffdd..b9c47b3 100644
--- a/libgimp/gimp_pdb_headers.h
+++ b/libgimp/gimp_pdb_headers.h
@@ -33,14 +33,12 @@
 #include <libgimp/gimpbrushselect_pdb.h>
 #include <libgimp/gimpbuffer_pdb.h>
 #include <libgimp/gimpchannel_pdb.h>
-#include <libgimp/gimpcolor_pdb.h>
 #include <libgimp/gimpcontext_pdb.h>
 #include <libgimp/gimpdebug_pdb.h>
 #include <libgimp/gimpdisplay_pdb.h>
 #include <libgimp/gimpdrawable_pdb.h>
 #include <libgimp/gimpdrawablecolor_pdb.h>
 #include <libgimp/gimpdrawableedit_pdb.h>
-#include <libgimp/gimpdrawabletransform_pdb.h>
 #include <libgimp/gimpdynamics_pdb.h>
 #include <libgimp/gimpedit_pdb.h>
 #include <libgimp/gimpfileops_pdb.h>
@@ -69,7 +67,6 @@
 #include <libgimp/gimppalette_pdb.h>
 #include <libgimp/gimppalettes_pdb.h>
 #include <libgimp/gimppaletteselect_pdb.h>
-#include <libgimp/gimppaths_pdb.h>
 #include <libgimp/gimppattern_pdb.h>
 #include <libgimp/gimppatterns_pdb.h>
 #include <libgimp/gimppatternselect_pdb.h>
@@ -77,10 +74,8 @@
 #include <libgimp/gimpproceduraldb_pdb.h>
 #include <libgimp/gimpprogress_pdb.h>
 #include <libgimp/gimpselection_pdb.h>
-#include <libgimp/gimpselectiontools_pdb.h>
 #include <libgimp/gimptextlayer_pdb.h>
 #include <libgimp/gimptexttool_pdb.h>
-#include <libgimp/gimptransformtools_pdb.h>
 #include <libgimp/gimpunit_pdb.h>
 #include <libgimp/gimpvectors_pdb.h>
 
diff --git a/libgimp/gimpbrushes_pdb.c b/libgimp/gimpbrushes_pdb.c
index fa947bc..51f3f97 100644
--- a/libgimp/gimpbrushes_pdb.c
+++ b/libgimp/gimpbrushes_pdb.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "gimp.h"
 
 
@@ -109,148 +107,3 @@ gimp_brushes_get_list (const gchar *filter,
 
   return brush_list;
 }
-
-/**
- * gimp_brushes_get_brush:
- * @width: The brush width.
- * @height: The brush height.
- * @spacing: The brush spacing.
- *
- * Deprecated: Use gimp_context_get_brush() instead.
- *
- * Returns: The brush name.
- **/
-gchar *
-gimp_brushes_get_brush (gint *width,
-                        gint *height,
-                        gint *spacing)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-brushes-get-brush",
-                                    &nreturn_vals,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      name = g_strdup (return_vals[1].data.d_string);
-      *width = return_vals[2].data.d_int32;
-      *height = return_vals[3].data.d_int32;
-      *spacing = return_vals[4].data.d_int32;
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return name;
-}
-
-/**
- * gimp_brushes_get_spacing:
- *
- * Deprecated: Use gimp_brush_get_spacing() instead.
- *
- * Returns: The brush spacing.
- **/
-gint
-gimp_brushes_get_spacing (void)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gint spacing = 0;
-
-  return_vals = gimp_run_procedure ("gimp-brushes-get-spacing",
-                                    &nreturn_vals,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    spacing = return_vals[1].data.d_int32;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return spacing;
-}
-
-/**
- * gimp_brushes_set_spacing:
- * @spacing: The brush spacing.
- *
- * Deprecated: Use gimp_brush_set_spacing() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_brushes_set_spacing (gint spacing)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-brushes-set-spacing",
-                                    &nreturn_vals,
-                                    GIMP_PDB_INT32, spacing,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_brushes_get_brush_data:
- * @name: The brush name (\"\" means current active brush).
- * @opacity: The brush opacity.
- * @spacing: The brush spacing.
- * @paint_mode: The paint mode.
- * @width: The brush width.
- * @height: The brush height.
- * @length: Length of brush mask data.
- * @mask_data: The brush mask data.
- *
- * Deprecated: Use gimp_brush_get_pixels() instead.
- *
- * Returns: The brush name.
- **/
-gchar *
-gimp_brushes_get_brush_data (const gchar    *name,
-                             gdouble        *opacity,
-                             gint           *spacing,
-                             GimpLayerMode  *paint_mode,
-                             gint           *width,
-                             gint           *height,
-                             gint           *length,
-                             guint8        **mask_data)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *actual_name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-brushes-get-brush-data",
-                                    &nreturn_vals,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_END);
-
-  *length = 0;
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      actual_name = g_strdup (return_vals[1].data.d_string);
-      *opacity = return_vals[2].data.d_float;
-      *spacing = return_vals[3].data.d_int32;
-      *paint_mode = return_vals[4].data.d_int32;
-      *width = return_vals[5].data.d_int32;
-      *height = return_vals[6].data.d_int32;
-      *length = return_vals[7].data.d_int32;
-      *mask_data = g_new (guint8, *length);
-      memcpy (*mask_data,
-              return_vals[8].data.d_int8array,
-              *length * sizeof (guint8));
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return actual_name;
-}
diff --git a/libgimp/gimpbrushes_pdb.h b/libgimp/gimpbrushes_pdb.h
index f281b9c..00cc2c7 100644
--- a/libgimp/gimpbrushes_pdb.h
+++ b/libgimp/gimpbrushes_pdb.h
@@ -32,26 +32,9 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_brushes_refresh        (void);
-gchar**  gimp_brushes_get_list       (const gchar    *filter,
-                                      gint           *num_brushes);
-GIMP_DEPRECATED_FOR(gimp_context_get_brush)
-gchar*   gimp_brushes_get_brush      (gint           *width,
-                                      gint           *height,
-                                      gint           *spacing);
-GIMP_DEPRECATED_FOR(gimp_brush_get_spacing)
-gint     gimp_brushes_get_spacing    (void);
-GIMP_DEPRECATED_FOR(gimp_brush_set_spacing)
-gboolean gimp_brushes_set_spacing    (gint            spacing);
-GIMP_DEPRECATED_FOR(gimp_brush_get_pixels)
-gchar*   gimp_brushes_get_brush_data (const gchar    *name,
-                                      gdouble        *opacity,
-                                      gint           *spacing,
-                                      GimpLayerMode  *paint_mode,
-                                      gint           *width,
-                                      gint           *height,
-                                      gint           *length,
-                                      guint8        **mask_data);
+gboolean gimp_brushes_refresh  (void);
+gchar**  gimp_brushes_get_list (const gchar *filter,
+                                gint        *num_brushes);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpcontext_pdb.c b/libgimp/gimpcontext_pdb.c
index 8b352ce..6e265ea 100644
--- a/libgimp/gimpcontext_pdb.c
+++ b/libgimp/gimpcontext_pdb.c
@@ -3270,59 +3270,6 @@ gimp_context_set_transform_resize (GimpTransformResize transform_resize)
 }
 
 /**
- * gimp_context_get_transform_recursion:
- *
- * Deprecated: There is no replacement for this procedure.
- *
- * Returns: This returns always 3 and is meaningless.
- **/
-gint
-gimp_context_get_transform_recursion (void)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gint transform_recursion = 0;
-
-  return_vals = gimp_run_procedure ("gimp-context-get-transform-recursion",
-                                    &nreturn_vals,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    transform_recursion = return_vals[1].data.d_int32;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return transform_recursion;
-}
-
-/**
- * gimp_context_set_transform_recursion:
- * @transform_recursion: This parameter is ignored.
- *
- * Deprecated: There is no replacement for this procedure.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_context_set_transform_recursion (gint transform_recursion)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-context-set-transform-recursion",
-                                    &nreturn_vals,
-                                    GIMP_PDB_INT32, transform_recursion,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_context_get_ink_size:
  *
  * Get ink blob size in pixels.
diff --git a/libgimp/gimpcontext_pdb.h b/libgimp/gimpcontext_pdb.h
index 0796048..333d5c7 100644
--- a/libgimp/gimpcontext_pdb.h
+++ b/libgimp/gimpcontext_pdb.h
@@ -134,10 +134,6 @@ GimpTransformDirection      gimp_context_get_transform_direction        (void);
 gboolean                    gimp_context_set_transform_direction        (GimpTransformDirection         
transform_direction);
 GimpTransformResize         gimp_context_get_transform_resize           (void);
 gboolean                    gimp_context_set_transform_resize           (GimpTransformResize            
transform_resize);
-GIMP_DEPRECATED
-gint                        gimp_context_get_transform_recursion        (void);
-GIMP_DEPRECATED
-gboolean                    gimp_context_set_transform_recursion        (gint                           
transform_recursion);
 gdouble                     gimp_context_get_ink_size                   (void);
 gboolean                    gimp_context_set_ink_size                   (gdouble                        
size);
 gdouble                     gimp_context_get_ink_angle                  (void);
diff --git a/libgimp/gimpdrawable_pdb.c b/libgimp/gimpdrawable_pdb.c
index 765a0da..159f97d 100644
--- a/libgimp/gimpdrawable_pdb.c
+++ b/libgimp/gimpdrawable_pdb.c
@@ -393,36 +393,6 @@ gimp_drawable_offsets (gint32  drawable_ID,
 }
 
 /**
- * gimp_drawable_set_image:
- * @drawable_ID: The drawable.
- * @image_ID: The image.
- *
- * Deprecated: There is no replacement for this procedure.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_set_image (gint32 drawable_ID,
-                         gint32 image_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-drawable-set-image",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_drawable_mask_bounds:
  * @drawable_ID: The drawable.
  * @x1: x coordinate of the upper left corner of selection bounds.
diff --git a/libgimp/gimpdrawable_pdb.h b/libgimp/gimpdrawable_pdb.h
index beed194..a1eb9a3 100644
--- a/libgimp/gimpdrawable_pdb.h
+++ b/libgimp/gimpdrawable_pdb.h
@@ -45,9 +45,6 @@ gint                     gimp_drawable_height             (gint32
 gboolean                 gimp_drawable_offsets            (gint32                      drawable_ID,
                                                            gint                       *offset_x,
                                                            gint                       *offset_y);
-GIMP_DEPRECATED
-gboolean                 gimp_drawable_set_image          (gint32                      drawable_ID,
-                                                           gint32                      image_ID);
 gboolean                 gimp_drawable_mask_bounds        (gint32                      drawable_ID,
                                                            gint                       *x1,
                                                            gint                       *y1,
diff --git a/libgimp/gimpedit_pdb.c b/libgimp/gimpedit_pdb.c
index 3eb8340..e84b5b5 100644
--- a/libgimp/gimpedit_pdb.c
+++ b/libgimp/gimpedit_pdb.c
@@ -415,367 +415,3 @@ gimp_edit_named_paste_as_new_image (const gchar *buffer_name)
 
   return image_ID;
 }
-
-/**
- * gimp_edit_clear:
- * @drawable_ID: The drawable to clear from.
- *
- * Clear selected area of drawable.
- *
- * This procedure clears the specified drawable. If the drawable has an
- * alpha channel, the cleared pixels will become transparent. If the
- * drawable does not have an alpha channel, cleared pixels will be set
- * to the background color. This procedure only affects regions within
- * a selection if there is a selection active.
- *
- * Deprecated: Use gimp_drawable_edit_clear() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_edit_clear (gint32 drawable_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-clear",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_edit_fill:
- * @drawable_ID: The drawable to fill to.
- * @fill_type: The type of fill.
- *
- * Fill selected area of drawable.
- *
- * This procedure fills the specified drawable with the fill mode. If
- * the fill mode is foreground, the current foreground color is used.
- * If the fill mode is background, the current background color is
- * used. Other fill modes should not be used. This procedure only
- * affects regions within a selection if there is a selection active.
- * If you want to fill the whole drawable, regardless of the selection,
- * use gimp_drawable_fill().
- *
- * Deprecated: Use gimp_drawable_edit_fill() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_edit_fill (gint32       drawable_ID,
-                GimpFillType fill_type)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-fill",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_INT32, fill_type,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_edit_bucket_fill:
- * @drawable_ID: The affected drawable.
- * @fill_mode: The type of fill.
- * @paint_mode: The paint application mode.
- * @opacity: The opacity of the final bucket fill.
- * @threshold: The threshold determines how extensive the seed fill will be. It's value is specified in 
terms of intensity levels. This parameter is only valid when there is no selection in the specified image.
- * @sample_merged: Use the composite image, not the drawable.
- * @x: The x coordinate of this bucket fill's application. This parameter is only valid when there is no 
selection in the specified image.
- * @y: The y coordinate of this bucket fill's application. This parameter is only valid when there is no 
selection in the specified image.
- *
- * Fill the area specified either by the current selection if there is
- * one, or by a seed fill starting at the specified coordinates.
- *
- * This tool requires information on the paint application mode, and
- * the fill mode, which can either be in the foreground color, or in
- * the currently active pattern. If there is no selection, a seed fill
- * is executed at the specified coordinates and extends outward in
- * keeping with the threshold parameter. If there is a selection in the
- * target image, the threshold, sample merged, x, and y arguments are
- * unused. If the sample_merged parameter is TRUE, the data of the
- * composite image will be used instead of that for the specified
- * drawable. This is equivalent to sampling for colors after merging
- * all visible layers. In the case of merged sampling, the x and y
- * coordinates are relative to the image's origin; otherwise, they are
- * relative to the drawable's origin.
- *
- * Deprecated: Use gimp_drawable_edit_bucket_fill() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_edit_bucket_fill (gint32             drawable_ID,
-                       GimpBucketFillMode fill_mode,
-                       GimpLayerMode      paint_mode,
-                       gdouble            opacity,
-                       gdouble            threshold,
-                       gboolean           sample_merged,
-                       gdouble            x,
-                       gdouble            y)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-bucket-fill",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_INT32, fill_mode,
-                                    GIMP_PDB_INT32, paint_mode,
-                                    GIMP_PDB_FLOAT, opacity,
-                                    GIMP_PDB_FLOAT, threshold,
-                                    GIMP_PDB_INT32, sample_merged,
-                                    GIMP_PDB_FLOAT, x,
-                                    GIMP_PDB_FLOAT, y,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_edit_bucket_fill_full:
- * @drawable_ID: The affected drawable.
- * @fill_mode: The type of fill.
- * @paint_mode: The paint application mode.
- * @opacity: The opacity of the final bucket fill.
- * @threshold: The threshold determines how extensive the seed fill will be. It's value is specified in 
terms of intensity levels. This parameter is only valid when there is no selection in the specified image.
- * @sample_merged: Use the composite image, not the drawable.
- * @fill_transparent: Whether to consider transparent pixels for filling. If TRUE, transparency is 
considered as a unique fillable color.
- * @select_criterion: The criterion used to determine color similarity. SELECT_CRITERION_COMPOSITE is the 
standard choice.
- * @x: The x coordinate of this bucket fill's application. This parameter is only valid when there is no 
selection in the specified image.
- * @y: The y coordinate of this bucket fill's application. This parameter is only valid when there is no 
selection in the specified image.
- *
- * Fill the area specified either by the current selection if there is
- * one, or by a seed fill starting at the specified coordinates.
- *
- * This tool requires information on the paint application mode, and
- * the fill mode, which can either be in the foreground color, or in
- * the currently active pattern. If there is no selection, a seed fill
- * is executed at the specified coordinates and extends outward in
- * keeping with the threshold parameter. If there is a selection in the
- * target image, the threshold, sample merged, x, and y arguments are
- * unused. If the sample_merged parameter is TRUE, the data of the
- * composite image will be used instead of that for the specified
- * drawable. This is equivalent to sampling for colors after merging
- * all visible layers. In the case of merged sampling, the x and y
- * coordinates are relative to the image's origin; otherwise, they are
- * relative to the drawable's origin.
- *
- * Deprecated: Use gimp_drawable_edit_bucket_fill() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_edit_bucket_fill_full (gint32              drawable_ID,
-                            GimpBucketFillMode  fill_mode,
-                            GimpLayerMode       paint_mode,
-                            gdouble             opacity,
-                            gdouble             threshold,
-                            gboolean            sample_merged,
-                            gboolean            fill_transparent,
-                            GimpSelectCriterion select_criterion,
-                            gdouble             x,
-                            gdouble             y)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-bucket-fill-full",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_INT32, fill_mode,
-                                    GIMP_PDB_INT32, paint_mode,
-                                    GIMP_PDB_FLOAT, opacity,
-                                    GIMP_PDB_FLOAT, threshold,
-                                    GIMP_PDB_INT32, sample_merged,
-                                    GIMP_PDB_INT32, fill_transparent,
-                                    GIMP_PDB_INT32, select_criterion,
-                                    GIMP_PDB_FLOAT, x,
-                                    GIMP_PDB_FLOAT, y,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_edit_blend:
- * @drawable_ID: The affected drawable.
- * @blend_mode: The type of blend.
- * @paint_mode: The paint application mode.
- * @gradient_type: The type of gradient.
- * @opacity: The opacity of the final blend.
- * @offset: Offset relates to the starting and ending coordinates specified for the blend. This parameter is 
mode dependent.
- * @repeat: Repeat mode.
- * @reverse: Use the reverse gradient.
- * @supersample: Do adaptive supersampling.
- * @max_depth: Maximum recursion levels for supersampling.
- * @threshold: Supersampling threshold.
- * @dither: Use dithering to reduce banding.
- * @x1: The x coordinate of this blend's starting point.
- * @y1: The y coordinate of this blend's starting point.
- * @x2: The x coordinate of this blend's ending point.
- * @y2: The y coordinate of this blend's ending point.
- *
- * Blend between the starting and ending coordinates with the specified
- * blend mode and gradient type.
- *
- * This tool requires information on the paint application mode, the
- * blend mode, and the gradient type. It creates the specified variety
- * of blend using the starting and ending coordinates as defined for
- * each gradient type. For shapeburst gradient types, the context's
- * distance metric is also relevant and can be updated with
- * gimp_context_set_distance_metric().
- *
- * Deprecated: Use gimp_drawable_edit_gradient_fill() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_edit_blend (gint32           drawable_ID,
-                 GimpBlendMode    blend_mode,
-                 GimpLayerMode    paint_mode,
-                 GimpGradientType gradient_type,
-                 gdouble          opacity,
-                 gdouble          offset,
-                 GimpRepeatMode   repeat,
-                 gboolean         reverse,
-                 gboolean         supersample,
-                 gint             max_depth,
-                 gdouble          threshold,
-                 gboolean         dither,
-                 gdouble          x1,
-                 gdouble          y1,
-                 gdouble          x2,
-                 gdouble          y2)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-blend",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_INT32, blend_mode,
-                                    GIMP_PDB_INT32, paint_mode,
-                                    GIMP_PDB_INT32, gradient_type,
-                                    GIMP_PDB_FLOAT, opacity,
-                                    GIMP_PDB_FLOAT, offset,
-                                    GIMP_PDB_INT32, repeat,
-                                    GIMP_PDB_INT32, reverse,
-                                    GIMP_PDB_INT32, supersample,
-                                    GIMP_PDB_INT32, max_depth,
-                                    GIMP_PDB_FLOAT, threshold,
-                                    GIMP_PDB_INT32, dither,
-                                    GIMP_PDB_FLOAT, x1,
-                                    GIMP_PDB_FLOAT, y1,
-                                    GIMP_PDB_FLOAT, x2,
-                                    GIMP_PDB_FLOAT, y2,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_edit_stroke:
- * @drawable_ID: The drawable to stroke to.
- *
- * Stroke the current selection
- *
- * This procedure strokes the current selection, painting along the
- * selection boundary with the active brush and foreground color. The
- * paint is applied to the specified drawable regardless of the active
- * selection.
- *
- * Deprecated: Use gimp_drawable_edit_stroke_selection() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_edit_stroke (gint32 drawable_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-stroke",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_edit_stroke_vectors:
- * @drawable_ID: The drawable to stroke to.
- * @vectors_ID: The vectors object.
- *
- * Stroke the specified vectors object
- *
- * This procedure strokes the specified vectors object, painting along
- * the path with the active brush and foreground color.
- *
- * Deprecated: Use gimp_drawable_edit_stroke_item() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_edit_stroke_vectors (gint32 drawable_ID,
-                          gint32 vectors_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-edit-stroke-vectors",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
diff --git a/libgimp/gimpedit_pdb.h b/libgimp/gimpedit_pdb.h
index 0c64bb7..5bf8ed5 100644
--- a/libgimp/gimpedit_pdb.h
+++ b/libgimp/gimpedit_pdb.h
@@ -32,69 +32,22 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_edit_cut                      (gint32               drawable_ID);
-gboolean gimp_edit_copy                     (gint32               drawable_ID);
-gboolean gimp_edit_copy_visible             (gint32               image_ID);
-gint32   gimp_edit_paste                    (gint32               drawable_ID,
-                                             gboolean             paste_into);
+gboolean gimp_edit_cut                      (gint32       drawable_ID);
+gboolean gimp_edit_copy                     (gint32       drawable_ID);
+gboolean gimp_edit_copy_visible             (gint32       image_ID);
+gint32   gimp_edit_paste                    (gint32       drawable_ID,
+                                             gboolean     paste_into);
 gint32   gimp_edit_paste_as_new_image       (void);
-gchar*   gimp_edit_named_cut                (gint32               drawable_ID,
-                                             const gchar         *buffer_name);
-gchar*   gimp_edit_named_copy               (gint32               drawable_ID,
-                                             const gchar         *buffer_name);
-gchar*   gimp_edit_named_copy_visible       (gint32               image_ID,
-                                             const gchar         *buffer_name);
-gint32   gimp_edit_named_paste              (gint32               drawable_ID,
-                                             const gchar         *buffer_name,
-                                             gboolean             paste_into);
-gint32   gimp_edit_named_paste_as_new_image (const gchar         *buffer_name);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_clear)
-gboolean gimp_edit_clear                    (gint32               drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_fill)
-gboolean gimp_edit_fill                     (gint32               drawable_ID,
-                                             GimpFillType         fill_type);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_bucket_fill)
-gboolean gimp_edit_bucket_fill              (gint32               drawable_ID,
-                                             GimpBucketFillMode   fill_mode,
-                                             GimpLayerMode        paint_mode,
-                                             gdouble              opacity,
-                                             gdouble              threshold,
-                                             gboolean             sample_merged,
-                                             gdouble              x,
-                                             gdouble              y);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_bucket_fill)
-gboolean gimp_edit_bucket_fill_full         (gint32               drawable_ID,
-                                             GimpBucketFillMode   fill_mode,
-                                             GimpLayerMode        paint_mode,
-                                             gdouble              opacity,
-                                             gdouble              threshold,
-                                             gboolean             sample_merged,
-                                             gboolean             fill_transparent,
-                                             GimpSelectCriterion  select_criterion,
-                                             gdouble              x,
-                                             gdouble              y);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_gradient_fill)
-gboolean gimp_edit_blend                    (gint32               drawable_ID,
-                                             GimpBlendMode        blend_mode,
-                                             GimpLayerMode        paint_mode,
-                                             GimpGradientType     gradient_type,
-                                             gdouble              opacity,
-                                             gdouble              offset,
-                                             GimpRepeatMode       repeat,
-                                             gboolean             reverse,
-                                             gboolean             supersample,
-                                             gint                 max_depth,
-                                             gdouble              threshold,
-                                             gboolean             dither,
-                                             gdouble              x1,
-                                             gdouble              y1,
-                                             gdouble              x2,
-                                             gdouble              y2);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_stroke_selection)
-gboolean gimp_edit_stroke                   (gint32               drawable_ID);
-GIMP_DEPRECATED_FOR(gimp_drawable_edit_stroke_item)
-gboolean gimp_edit_stroke_vectors           (gint32               drawable_ID,
-                                             gint32               vectors_ID);
+gchar*   gimp_edit_named_cut                (gint32       drawable_ID,
+                                             const gchar *buffer_name);
+gchar*   gimp_edit_named_copy               (gint32       drawable_ID,
+                                             const gchar *buffer_name);
+gchar*   gimp_edit_named_copy_visible       (gint32       image_ID,
+                                             const gchar *buffer_name);
+gint32   gimp_edit_named_paste              (gint32       drawable_ID,
+                                             const gchar *buffer_name,
+                                             gboolean     paste_into);
+gint32   gimp_edit_named_paste_as_new_image (const gchar *buffer_name);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpfloatingsel_pdb.c b/libgimp/gimpfloatingsel_pdb.c
index 3390dd0..5e2f26e 100644
--- a/libgimp/gimpfloatingsel_pdb.c
+++ b/libgimp/gimpfloatingsel_pdb.c
@@ -165,63 +165,3 @@ gimp_floating_sel_attach (gint32 layer_ID,
 
   return success;
 }
-
-/**
- * gimp_floating_sel_rigor:
- * @floating_sel_ID: The floating selection.
- * @undo: .
- *
- * Deprecated: There is no replacement for this procedure.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_floating_sel_rigor (gint32   floating_sel_ID,
-                         gboolean undo)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-floating-sel-rigor",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, floating_sel_ID,
-                                    GIMP_PDB_INT32, undo,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_floating_sel_relax:
- * @floating_sel_ID: The floating selection.
- * @undo: .
- *
- * Deprecated: There is no replacement for this procedure.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_floating_sel_relax (gint32   floating_sel_ID,
-                         gboolean undo)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-floating-sel-relax",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, floating_sel_ID,
-                                    GIMP_PDB_INT32, undo,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
diff --git a/libgimp/gimpfloatingsel_pdb.h b/libgimp/gimpfloatingsel_pdb.h
index 14d66cf..519d23d 100644
--- a/libgimp/gimpfloatingsel_pdb.h
+++ b/libgimp/gimpfloatingsel_pdb.h
@@ -32,17 +32,11 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_floating_sel_remove   (gint32   floating_sel_ID);
-gboolean gimp_floating_sel_anchor   (gint32   floating_sel_ID);
-gboolean gimp_floating_sel_to_layer (gint32   floating_sel_ID);
-gboolean gimp_floating_sel_attach   (gint32   layer_ID,
-                                     gint32   drawable_ID);
-GIMP_DEPRECATED
-gboolean gimp_floating_sel_rigor    (gint32   floating_sel_ID,
-                                     gboolean undo);
-GIMP_DEPRECATED
-gboolean gimp_floating_sel_relax    (gint32   floating_sel_ID,
-                                     gboolean undo);
+gboolean gimp_floating_sel_remove   (gint32 floating_sel_ID);
+gboolean gimp_floating_sel_anchor   (gint32 floating_sel_ID);
+gboolean gimp_floating_sel_to_layer (gint32 floating_sel_ID);
+gboolean gimp_floating_sel_attach   (gint32 layer_ID,
+                                     gint32 drawable_ID);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpgradients_pdb.c b/libgimp/gimpgradients_pdb.c
index 96a02f0..3ba2bba 100644
--- a/libgimp/gimpgradients_pdb.c
+++ b/libgimp/gimpgradients_pdb.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "gimp.h"
 
 
@@ -109,129 +107,3 @@ gimp_gradients_get_list (const gchar *filter,
 
   return gradient_list;
 }
-
-/**
- * gimp_gradients_sample_uniform:
- * @num_samples: The number of samples to take.
- * @reverse: Use the reverse gradient.
- *
- * Deprecated: Use gimp_gradient_get_uniform_samples() instead.
- *
- * Returns: Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }.
- **/
-gdouble *
-gimp_gradients_sample_uniform (gint     num_samples,
-                               gboolean reverse)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gdouble *color_samples = NULL;
-  gint num_color_samples;
-
-  return_vals = gimp_run_procedure ("gimp-gradients-sample-uniform",
-                                    &nreturn_vals,
-                                    GIMP_PDB_INT32, num_samples,
-                                    GIMP_PDB_INT32, reverse,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      num_color_samples = return_vals[1].data.d_int32;
-      color_samples = g_new (gdouble, num_color_samples);
-      memcpy (color_samples,
-              return_vals[2].data.d_floatarray,
-              num_color_samples * sizeof (gdouble));
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return color_samples;
-}
-
-/**
- * gimp_gradients_sample_custom:
- * @num_samples: The number of samples to take.
- * @positions: The list of positions to sample along the gradient.
- * @reverse: Use the reverse gradient.
- *
- * Deprecated: Use gimp_gradient_get_custom_samples() instead.
- *
- * Returns: Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }.
- **/
-gdouble *
-gimp_gradients_sample_custom (gint           num_samples,
-                              const gdouble *positions,
-                              gboolean       reverse)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gdouble *color_samples = NULL;
-  gint num_color_samples;
-
-  return_vals = gimp_run_procedure ("gimp-gradients-sample-custom",
-                                    &nreturn_vals,
-                                    GIMP_PDB_INT32, num_samples,
-                                    GIMP_PDB_FLOATARRAY, positions,
-                                    GIMP_PDB_INT32, reverse,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      num_color_samples = return_vals[1].data.d_int32;
-      color_samples = g_new (gdouble, num_color_samples);
-      memcpy (color_samples,
-              return_vals[2].data.d_floatarray,
-              num_color_samples * sizeof (gdouble));
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return color_samples;
-}
-
-/**
- * gimp_gradients_get_gradient_data:
- * @name: The gradient name (\"\" means current active gradient).
- * @sample_size: Size of the sample to return when the gradient is changed.
- * @reverse: Use the reverse gradient.
- * @width: The gradient sample width (r,g,b,a).
- * @grad_data: The gradient sample data.
- *
- * Deprecated: Use gimp_gradient_get_uniform_samples() instead.
- *
- * Returns: The gradient name.
- **/
-gchar *
-gimp_gradients_get_gradient_data (const gchar  *name,
-                                  gint          sample_size,
-                                  gboolean      reverse,
-                                  gint         *width,
-                                  gdouble     **grad_data)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *actual_name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-gradients-get-gradient-data",
-                                    &nreturn_vals,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_INT32, sample_size,
-                                    GIMP_PDB_INT32, reverse,
-                                    GIMP_PDB_END);
-
-  *width = 0;
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      actual_name = g_strdup (return_vals[1].data.d_string);
-      *width = return_vals[2].data.d_int32;
-      *grad_data = g_new (gdouble, *width);
-      memcpy (*grad_data,
-              return_vals[3].data.d_floatarray,
-              *width * sizeof (gdouble));
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return actual_name;
-}
diff --git a/libgimp/gimpgradients_pdb.h b/libgimp/gimpgradients_pdb.h
index a483bc5..291fe6c 100644
--- a/libgimp/gimpgradients_pdb.h
+++ b/libgimp/gimpgradients_pdb.h
@@ -32,22 +32,9 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_gradients_refresh           (void);
-gchar**  gimp_gradients_get_list          (const gchar    *filter,
-                                           gint           *num_gradients);
-GIMP_DEPRECATED_FOR(gimp_gradient_get_uniform_samples)
-gdouble* gimp_gradients_sample_uniform    (gint            num_samples,
-                                           gboolean        reverse);
-GIMP_DEPRECATED_FOR(gimp_gradient_get_custom_samples)
-gdouble* gimp_gradients_sample_custom     (gint            num_samples,
-                                           const gdouble  *positions,
-                                           gboolean        reverse);
-GIMP_DEPRECATED_FOR(gimp_gradient_get_uniform_samples)
-gchar*   gimp_gradients_get_gradient_data (const gchar    *name,
-                                           gint            sample_size,
-                                           gboolean        reverse,
-                                           gint           *width,
-                                           gdouble       **grad_data);
+gboolean gimp_gradients_refresh  (void);
+gchar**  gimp_gradients_get_list (const gchar *filter,
+                                  gint        *num_gradients);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpimage_pdb.c b/libgimp/gimpimage_pdb.c
index 9d0f866..1b1b6f3 100644
--- a/libgimp/gimpimage_pdb.c
+++ b/libgimp/gimpimage_pdb.c
@@ -421,33 +421,6 @@ gimp_image_height (gint32 image_ID)
 }
 
 /**
- * gimp_image_free_shadow:
- * @image_ID: The image.
- *
- * Deprecated: Use gimp_drawable_free_shadow() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_free_shadow (gint32 image_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-image-free-shadow",
-                                    &nreturn_vals,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_image_get_layers:
  * @image_ID: The image.
  * @num_layers: The number of layers contained in the image.
@@ -811,39 +784,6 @@ gimp_image_pick_correlate_layer (gint32 image_ID,
 }
 
 /**
- * gimp_image_add_layer:
- * @image_ID: The image.
- * @layer_ID: The layer.
- * @position: The layer position.
- *
- * Deprecated: Use gimp_image_insert_layer() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_add_layer (gint32 image_ID,
-                      gint32 layer_ID,
-                      gint   position)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-image-add-layer",
-                                    &nreturn_vals,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_LAYER, layer_ID,
-                                    GIMP_PDB_INT32, position,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_image_insert_layer:
  * @image_ID: The image.
  * @layer_ID: The layer.
@@ -1000,39 +940,6 @@ gimp_image_thaw_layers (gint32 image_ID)
 }
 
 /**
- * gimp_image_add_channel:
- * @image_ID: The image.
- * @channel_ID: The channel.
- * @position: The channel position.
- *
- * Deprecated: Use gimp_image_insert_channel() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_add_channel (gint32 image_ID,
-                        gint32 channel_ID,
-                        gint   position)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-image-add-channel",
-                                    &nreturn_vals,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_CHANNEL, channel_ID,
-                                    GIMP_PDB_INT32, position,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_image_insert_channel:
  * @image_ID: The image.
  * @channel_ID: The channel.
@@ -1182,39 +1089,6 @@ gimp_image_thaw_channels (gint32 image_ID)
 }
 
 /**
- * gimp_image_add_vectors:
- * @image_ID: The image.
- * @vectors_ID: The vectors object.
- * @position: The vectors objects position.
- *
- * Deprecated: Use gimp_image_insert_vectors() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_image_add_vectors (gint32 image_ID,
-                        gint32 vectors_ID,
-                        gint   position)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-image-add-vectors",
-                                    &nreturn_vals,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_INT32, position,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_image_insert_vectors:
  * @image_ID: The image.
  * @vectors_ID: The vectors.
diff --git a/libgimp/gimpimage_pdb.h b/libgimp/gimpimage_pdb.h
index 3a6171e..51ba415 100644
--- a/libgimp/gimpimage_pdb.h
+++ b/libgimp/gimpimage_pdb.h
@@ -48,8 +48,6 @@ GimpPrecision            gimp_image_get_precision              (gint32
 GimpLayerMode            gimp_image_get_default_new_layer_mode (gint32               image_ID);
 gint                     gimp_image_width                      (gint32               image_ID);
 gint                     gimp_image_height                     (gint32               image_ID);
-GIMP_DEPRECATED_FOR(gimp_drawable_free_shadow)
-gboolean                 gimp_image_free_shadow                (gint32               image_ID);
 gint*                    gimp_image_get_layers                 (gint32               image_ID,
                                                                 gint                *num_layers);
 gint*                    gimp_image_get_channels               (gint32               image_ID,
@@ -71,10 +69,6 @@ gboolean                 gimp_image_pick_color                 (gint32
 gint32                   gimp_image_pick_correlate_layer       (gint32               image_ID,
                                                                 gint                 x,
                                                                 gint                 y);
-GIMP_DEPRECATED_FOR(gimp_image_insert_layer)
-gboolean                 gimp_image_add_layer                  (gint32               image_ID,
-                                                                gint32               layer_ID,
-                                                                gint                 position);
 gboolean                 gimp_image_insert_layer               (gint32               image_ID,
                                                                 gint32               layer_ID,
                                                                 gint32               parent_ID,
@@ -83,10 +77,6 @@ gboolean                 gimp_image_remove_layer               (gint32
                                                                 gint32               layer_ID);
 gboolean                 gimp_image_freeze_layers              (gint32               image_ID);
 gboolean                 gimp_image_thaw_layers                (gint32               image_ID);
-GIMP_DEPRECATED_FOR(gimp_image_insert_channel)
-gboolean                 gimp_image_add_channel                (gint32               image_ID,
-                                                                gint32               channel_ID,
-                                                                gint                 position);
 gboolean                 gimp_image_insert_channel             (gint32               image_ID,
                                                                 gint32               channel_ID,
                                                                 gint32               parent_ID,
@@ -95,10 +85,6 @@ gboolean                 gimp_image_remove_channel             (gint32
                                                                 gint32               channel_ID);
 gboolean                 gimp_image_freeze_channels            (gint32               image_ID);
 gboolean                 gimp_image_thaw_channels              (gint32               image_ID);
-GIMP_DEPRECATED_FOR(gimp_image_insert_vectors)
-gboolean                 gimp_image_add_vectors                (gint32               image_ID,
-                                                                gint32               vectors_ID,
-                                                                gint                 position);
 gboolean                 gimp_image_insert_vectors             (gint32               image_ID,
                                                                 gint32               vectors_ID,
                                                                 gint32               parent_ID,
diff --git a/libgimp/gimpimagetransform_pdb.c b/libgimp/gimpimagetransform_pdb.c
index d6fcdcd..12e7e22 100644
--- a/libgimp/gimpimagetransform_pdb.c
+++ b/libgimp/gimpimagetransform_pdb.c
@@ -155,44 +155,6 @@ gimp_image_scale (gint32 image_ID,
 }
 
 /**
- * gimp_image_scale_full:
- * @image_ID: The image.
- * @new_width: New image width.
- * @new_height: New image height.
- * @interpolation: Type of interpolation.
- *
- * Deprecated: Use gimp_image_scale() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.6
- **/
-gboolean
-gimp_image_scale_full (gint32                image_ID,
-                       gint                  new_width,
-                       gint                  new_height,
-                       GimpInterpolationType interpolation)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-image-scale-full",
-                                    &nreturn_vals,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_INT32, new_width,
-                                    GIMP_PDB_INT32, new_height,
-                                    GIMP_PDB_INT32, interpolation,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_image_crop:
  * @image_ID: The image.
  * @new_width: New image width: (0 < new_width <= width).
diff --git a/libgimp/gimpimagetransform_pdb.h b/libgimp/gimpimagetransform_pdb.h
index 624c635..3d71492 100644
--- a/libgimp/gimpimagetransform_pdb.h
+++ b/libgimp/gimpimagetransform_pdb.h
@@ -32,29 +32,24 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_image_resize           (gint32                image_ID,
-                                      gint                  new_width,
-                                      gint                  new_height,
-                                      gint                  offx,
-                                      gint                  offy);
-gboolean gimp_image_resize_to_layers (gint32                image_ID);
-gboolean gimp_image_scale            (gint32                image_ID,
-                                      gint                  new_width,
-                                      gint                  new_height);
-GIMP_DEPRECATED_FOR(gimp_image_scale)
-gboolean gimp_image_scale_full       (gint32                image_ID,
-                                      gint                  new_width,
-                                      gint                  new_height,
-                                      GimpInterpolationType interpolation);
-gboolean gimp_image_crop             (gint32                image_ID,
-                                      gint                  new_width,
-                                      gint                  new_height,
-                                      gint                  offx,
-                                      gint                  offy);
-gboolean gimp_image_flip             (gint32                image_ID,
-                                      GimpOrientationType   flip_type);
-gboolean gimp_image_rotate           (gint32                image_ID,
-                                      GimpRotationType      rotate_type);
+gboolean gimp_image_resize           (gint32              image_ID,
+                                      gint                new_width,
+                                      gint                new_height,
+                                      gint                offx,
+                                      gint                offy);
+gboolean gimp_image_resize_to_layers (gint32              image_ID);
+gboolean gimp_image_scale            (gint32              image_ID,
+                                      gint                new_width,
+                                      gint                new_height);
+gboolean gimp_image_crop             (gint32              image_ID,
+                                      gint                new_width,
+                                      gint                new_height,
+                                      gint                offx,
+                                      gint                offy);
+gboolean gimp_image_flip             (gint32              image_ID,
+                                      GimpOrientationType flip_type);
+gboolean gimp_image_rotate           (gint32              image_ID,
+                                      GimpRotationType    rotate_type);
 
 
 G_END_DECLS
diff --git a/libgimp/gimplayer_pdb.c b/libgimp/gimplayer_pdb.c
index c3a83ec..321f70a 100644
--- a/libgimp/gimplayer_pdb.c
+++ b/libgimp/gimplayer_pdb.c
@@ -353,47 +353,6 @@ gimp_layer_scale (gint32   layer_ID,
 }
 
 /**
- * gimp_layer_scale_full:
- * @layer_ID: The layer.
- * @new_width: New layer width.
- * @new_height: New layer height.
- * @local_origin: Use a local origin (as opposed to the image origin).
- * @interpolation: Type of interpolation.
- *
- * Deprecated: Use gimp_layer_scale() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.6
- **/
-gboolean
-gimp_layer_scale_full (gint32                layer_ID,
-                       gint                  new_width,
-                       gint                  new_height,
-                       gboolean              local_origin,
-                       GimpInterpolationType interpolation)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-layer-scale-full",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, layer_ID,
-                                    GIMP_PDB_INT32, new_width,
-                                    GIMP_PDB_INT32, new_height,
-                                    GIMP_PDB_INT32, local_origin,
-                                    GIMP_PDB_INT32, interpolation,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_layer_resize:
  * @layer_ID: The layer.
  * @new_width: New layer width.
@@ -468,48 +427,6 @@ gimp_layer_resize_to_image_size (gint32 layer_ID)
 }
 
 /**
- * gimp_layer_translate:
- * @layer_ID: The layer.
- * @offx: Offset in x direction.
- * @offy: Offset in y direction.
- *
- * Translate the layer by the specified offsets.
- *
- * This procedure translates the layer by the amounts specified in the
- * x and y arguments. These can be negative, and are considered offsets
- * from the current position. This command only works if the layer has
- * been added to an image. All additional layers contained in the image
- * which have the linked flag set to TRUE w ill also be translated by
- * the specified offsets.
- *
- * Deprecated: Use gimp_item_transform_translate() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_layer_translate (gint32 layer_ID,
-                      gint   offx,
-                      gint   offy)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-layer-translate",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, layer_ID,
-                                    GIMP_PDB_INT32, offx,
-                                    GIMP_PDB_INT32, offy,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_layer_set_offsets:
  * @layer_ID: The layer.
  * @offx: Offset in x direction.
diff --git a/libgimp/gimplayer_pdb.h b/libgimp/gimplayer_pdb.h
index 9266ef5..bfeb8a7 100644
--- a/libgimp/gimplayer_pdb.h
+++ b/libgimp/gimplayer_pdb.h
@@ -53,22 +53,12 @@ gboolean               gimp_layer_scale                (gint32
                                                         gint                    new_width,
                                                         gint                    new_height,
                                                         gboolean                local_origin);
-GIMP_DEPRECATED_FOR(gimp_layer_scale)
-gboolean               gimp_layer_scale_full           (gint32                  layer_ID,
-                                                        gint                    new_width,
-                                                        gint                    new_height,
-                                                        gboolean                local_origin,
-                                                        GimpInterpolationType   interpolation);
 gboolean               gimp_layer_resize               (gint32                  layer_ID,
                                                         gint                    new_width,
                                                         gint                    new_height,
                                                         gint                    offx,
                                                         gint                    offy);
 gboolean               gimp_layer_resize_to_image_size (gint32                  layer_ID);
-GIMP_DEPRECATED_FOR(gimp_item_transform_translate)
-gboolean               gimp_layer_translate            (gint32                  layer_ID,
-                                                        gint                    offx,
-                                                        gint                    offy);
 gboolean               gimp_layer_set_offsets          (gint32                  layer_ID,
                                                         gint                    offx,
                                                         gint                    offy);
diff --git a/libgimp/gimppalettes_pdb.c b/libgimp/gimppalettes_pdb.c
index 82b6336..4047653 100644
--- a/libgimp/gimppalettes_pdb.c
+++ b/libgimp/gimppalettes_pdb.c
@@ -107,72 +107,3 @@ gimp_palettes_get_list (const gchar *filter,
 
   return palette_list;
 }
-
-/**
- * gimp_palettes_get_palette:
- * @num_colors: The palette num_colors.
- *
- * Deprecated: Use gimp_context_get_palette() instead.
- *
- * Returns: The palette name.
- **/
-gchar *
-gimp_palettes_get_palette (gint *num_colors)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-palettes-get-palette",
-                                    &nreturn_vals,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      name = g_strdup (return_vals[1].data.d_string);
-      *num_colors = return_vals[2].data.d_int32;
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return name;
-}
-
-/**
- * gimp_palettes_get_palette_entry:
- * @name: The palette name (\"\" means currently active palette).
- * @entry_num: The entry to retrieve.
- * @num_colors: The palette num_colors.
- * @color: The color requested.
- *
- * Deprecated: Use gimp_palette_entry_get_color() instead.
- *
- * Returns: The palette name.
- **/
-gchar *
-gimp_palettes_get_palette_entry (const gchar *name,
-                                 gint         entry_num,
-                                 gint        *num_colors,
-                                 GimpRGB     *color)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *actual_name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-palettes-get-palette-entry",
-                                    &nreturn_vals,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_INT32, entry_num,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      actual_name = g_strdup (return_vals[1].data.d_string);
-      *num_colors = return_vals[2].data.d_int32;
-      *color = return_vals[3].data.d_color;
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return actual_name;
-}
diff --git a/libgimp/gimppalettes_pdb.h b/libgimp/gimppalettes_pdb.h
index fd4fa58..e4b9d22 100644
--- a/libgimp/gimppalettes_pdb.h
+++ b/libgimp/gimppalettes_pdb.h
@@ -32,16 +32,9 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_palettes_refresh           (void);
-gchar**  gimp_palettes_get_list          (const gchar *filter,
-                                          gint        *num_palettes);
-GIMP_DEPRECATED_FOR(gimp_context_get_palette)
-gchar*   gimp_palettes_get_palette       (gint        *num_colors);
-GIMP_DEPRECATED_FOR(gimp_palette_entry_get_color)
-gchar*   gimp_palettes_get_palette_entry (const gchar *name,
-                                          gint         entry_num,
-                                          gint        *num_colors,
-                                          GimpRGB     *color);
+gboolean gimp_palettes_refresh  (void);
+gchar**  gimp_palettes_get_list (const gchar *filter,
+                                 gint        *num_palettes);
 
 
 G_END_DECLS
diff --git a/libgimp/gimppatterns_pdb.c b/libgimp/gimppatterns_pdb.c
index daa79c7..91f0caa 100644
--- a/libgimp/gimppatterns_pdb.c
+++ b/libgimp/gimppatterns_pdb.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "gimp.h"
 
 
@@ -109,86 +107,3 @@ gimp_patterns_get_list (const gchar *filter,
 
   return pattern_list;
 }
-
-/**
- * gimp_patterns_get_pattern:
- * @width: The pattern width.
- * @height: The pattern height.
- *
- * Deprecated: Use gimp_context_get_pattern() instead.
- *
- * Returns: The pattern name.
- **/
-gchar *
-gimp_patterns_get_pattern (gint *width,
-                           gint *height)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-patterns-get-pattern",
-                                    &nreturn_vals,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      name = g_strdup (return_vals[1].data.d_string);
-      *width = return_vals[2].data.d_int32;
-      *height = return_vals[3].data.d_int32;
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return name;
-}
-
-/**
- * gimp_patterns_get_pattern_data:
- * @name: The pattern name (\"\" means currently active pattern).
- * @width: The pattern width.
- * @height: The pattern height.
- * @mask_bpp: Pattern bytes per pixel.
- * @length: Length of pattern mask data.
- * @mask_data: The pattern mask data.
- *
- * Deprecated: Use gimp_pattern_get_pixels() instead.
- *
- * Returns: The pattern name.
- **/
-gchar *
-gimp_patterns_get_pattern_data (const gchar  *name,
-                                gint         *width,
-                                gint         *height,
-                                gint         *mask_bpp,
-                                gint         *length,
-                                guint8      **mask_data)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gchar *actual_name = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-patterns-get-pattern-data",
-                                    &nreturn_vals,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_END);
-
-  *length = 0;
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      actual_name = g_strdup (return_vals[1].data.d_string);
-      *width = return_vals[2].data.d_int32;
-      *height = return_vals[3].data.d_int32;
-      *mask_bpp = return_vals[4].data.d_int32;
-      *length = return_vals[5].data.d_int32;
-      *mask_data = g_new (guint8, *length);
-      memcpy (*mask_data,
-              return_vals[6].data.d_int8array,
-              *length * sizeof (guint8));
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return actual_name;
-}
diff --git a/libgimp/gimppatterns_pdb.h b/libgimp/gimppatterns_pdb.h
index 1945fbd..5d37a05 100644
--- a/libgimp/gimppatterns_pdb.h
+++ b/libgimp/gimppatterns_pdb.h
@@ -32,19 +32,9 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean gimp_patterns_refresh          (void);
-gchar**  gimp_patterns_get_list         (const gchar  *filter,
-                                         gint         *num_patterns);
-GIMP_DEPRECATED_FOR(gimp_context_get_pattern)
-gchar*   gimp_patterns_get_pattern      (gint         *width,
-                                         gint         *height);
-GIMP_DEPRECATED_FOR(gimp_pattern_get_pixels)
-gchar*   gimp_patterns_get_pattern_data (const gchar  *name,
-                                         gint         *width,
-                                         gint         *height,
-                                         gint         *mask_bpp,
-                                         gint         *length,
-                                         guint8      **mask_data);
+gboolean gimp_patterns_refresh  (void);
+gchar**  gimp_patterns_get_list (const gchar *filter,
+                                 gint        *num_patterns);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpselection_pdb.c b/libgimp/gimpselection_pdb.c
index 9043518..1312e6c 100644
--- a/libgimp/gimpselection_pdb.c
+++ b/libgimp/gimpselection_pdb.c
@@ -534,60 +534,6 @@ gimp_selection_flood (gint32 image_ID)
 }
 
 /**
- * gimp_selection_layer_alpha:
- * @layer_ID: Layer with alpha.
- *
- * Deprecated: Use gimp_image_select_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_selection_layer_alpha (gint32 layer_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-selection-layer-alpha",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, layer_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_selection_load:
- * @channel_ID: The channel.
- *
- * Deprecated: Use gimp_image_select_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_selection_load (gint32 channel_ID)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-selection-load",
-                                    &nreturn_vals,
-                                    GIMP_PDB_CHANNEL, channel_ID,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_selection_save:
  * @image_ID: The image.
  *
@@ -618,33 +564,3 @@ gimp_selection_save (gint32 image_ID)
 
   return channel_ID;
 }
-
-/**
- * gimp_selection_combine:
- * @channel_ID: The channel.
- * @operation: The selection operation.
- *
- * Deprecated: Use gimp_image_select_item() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_selection_combine (gint32         channel_ID,
-                        GimpChannelOps operation)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-selection-combine",
-                                    &nreturn_vals,
-                                    GIMP_PDB_CHANNEL, channel_ID,
-                                    GIMP_PDB_INT32, operation,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
diff --git a/libgimp/gimpselection_pdb.h b/libgimp/gimpselection_pdb.h
index cd21a90..f2743af 100644
--- a/libgimp/gimpselection_pdb.h
+++ b/libgimp/gimpselection_pdb.h
@@ -32,43 +32,36 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-gboolean               gimp_selection_bounds      (gint32          image_ID,
-                                                   gboolean       *non_empty,
-                                                   gint           *x1,
-                                                   gint           *y1,
-                                                   gint           *x2,
-                                                   gint           *y2);
-gint                   gimp_selection_value       (gint32          image_ID,
-                                                   gint            x,
-                                                   gint            y);
-gboolean               gimp_selection_is_empty    (gint32          image_ID);
-gboolean               gimp_selection_translate   (gint32          image_ID,
-                                                   gint            offx,
-                                                   gint            offy);
-G_GNUC_INTERNAL gint32 _gimp_selection_float      (gint32          drawable_ID,
-                                                   gint            offx,
-                                                   gint            offy);
-gboolean               gimp_selection_invert      (gint32          image_ID);
-gboolean               gimp_selection_sharpen     (gint32          image_ID);
-gboolean               gimp_selection_all         (gint32          image_ID);
-gboolean               gimp_selection_none        (gint32          image_ID);
-gboolean               gimp_selection_feather     (gint32          image_ID,
-                                                   gdouble         radius);
-gboolean               gimp_selection_border      (gint32          image_ID,
-                                                   gint            radius);
-gboolean               gimp_selection_grow        (gint32          image_ID,
-                                                   gint            steps);
-gboolean               gimp_selection_shrink      (gint32          image_ID,
-                                                   gint            steps);
-gboolean               gimp_selection_flood       (gint32          image_ID);
-GIMP_DEPRECATED_FOR(gimp_image_select_item)
-gboolean               gimp_selection_layer_alpha (gint32          layer_ID);
-GIMP_DEPRECATED_FOR(gimp_image_select_item)
-gboolean               gimp_selection_load        (gint32          channel_ID);
-gint32                 gimp_selection_save        (gint32          image_ID);
-GIMP_DEPRECATED_FOR(gimp_image_select_item)
-gboolean               gimp_selection_combine     (gint32          channel_ID,
-                                                   GimpChannelOps  operation);
+gboolean               gimp_selection_bounds    (gint32    image_ID,
+                                                 gboolean *non_empty,
+                                                 gint     *x1,
+                                                 gint     *y1,
+                                                 gint     *x2,
+                                                 gint     *y2);
+gint                   gimp_selection_value     (gint32    image_ID,
+                                                 gint      x,
+                                                 gint      y);
+gboolean               gimp_selection_is_empty  (gint32    image_ID);
+gboolean               gimp_selection_translate (gint32    image_ID,
+                                                 gint      offx,
+                                                 gint      offy);
+G_GNUC_INTERNAL gint32 _gimp_selection_float    (gint32    drawable_ID,
+                                                 gint      offx,
+                                                 gint      offy);
+gboolean               gimp_selection_invert    (gint32    image_ID);
+gboolean               gimp_selection_sharpen   (gint32    image_ID);
+gboolean               gimp_selection_all       (gint32    image_ID);
+gboolean               gimp_selection_none      (gint32    image_ID);
+gboolean               gimp_selection_feather   (gint32    image_ID,
+                                                 gdouble   radius);
+gboolean               gimp_selection_border    (gint32    image_ID,
+                                                 gint      radius);
+gboolean               gimp_selection_grow      (gint32    image_ID,
+                                                 gint      steps);
+gboolean               gimp_selection_shrink    (gint32    image_ID,
+                                                 gint      steps);
+gboolean               gimp_selection_flood     (gint32    image_ID);
+gint32                 gimp_selection_save      (gint32    image_ID);
 
 
 G_END_DECLS
diff --git a/libgimp/gimptextlayer_pdb.c b/libgimp/gimptextlayer_pdb.c
index 4634321..c3ece1b 100644
--- a/libgimp/gimptextlayer_pdb.c
+++ b/libgimp/gimptextlayer_pdb.c
@@ -1051,77 +1051,3 @@ gimp_text_layer_resize (gint32  layer_ID,
 
   return success;
 }
-
-/**
- * gimp_text_layer_get_hinting:
- * @layer_ID: The text layer.
- * @autohint: A flag which is true if the text layer is forced to use the autohinter from FreeType.
- *
- * Deprecated: Use gimp_text_layer_get_hint_style() instead.
- *
- * Returns: A flag which is true if hinting is used on the font.
- **/
-gboolean
-gimp_text_layer_get_hinting (gint32    layer_ID,
-                             gboolean *autohint)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean hinting = FALSE;
-
-  return_vals = gimp_run_procedure ("gimp-text-layer-get-hinting",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, layer_ID,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    {
-      hinting = return_vals[1].data.d_int32;
-      *autohint = return_vals[2].data.d_int32;
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return hinting;
-}
-
-/**
- * gimp_text_layer_set_hinting:
- * @layer_ID: The text layer.
- * @hinting: Enable/disable the use of hinting on the text.
- * @autohint: Force the use of the autohinter provided through FreeType.
- *
- * Enable/disable the use of hinting in a text layer.
- *
- * This procedure enables or disables hinting on the text of a text
- * layer. If you enable 'auto-hint', FreeType\'s automatic hinter will
- * be used and hinting information from the font will be ignored.
- *
- * Deprecated: Use gimp_text_layer_set_hint_style() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.6
- **/
-gboolean
-gimp_text_layer_set_hinting (gint32   layer_ID,
-                             gboolean hinting,
-                             gboolean autohint)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-text-layer-set-hinting",
-                                    &nreturn_vals,
-                                    GIMP_PDB_LAYER, layer_ID,
-                                    GIMP_PDB_INT32, hinting,
-                                    GIMP_PDB_INT32, autohint,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
diff --git a/libgimp/gimptextlayer_pdb.h b/libgimp/gimptextlayer_pdb.h
index 639b752..c695967 100644
--- a/libgimp/gimptextlayer_pdb.h
+++ b/libgimp/gimptextlayer_pdb.h
@@ -83,13 +83,6 @@ gboolean              gimp_text_layer_set_letter_spacing (gint32
 gboolean              gimp_text_layer_resize             (gint32                 layer_ID,
                                                           gdouble                width,
                                                           gdouble                height);
-GIMP_DEPRECATED_FOR(gimp_text_layer_get_hint_style)
-gboolean              gimp_text_layer_get_hinting        (gint32                 layer_ID,
-                                                          gboolean              *autohint);
-GIMP_DEPRECATED_FOR(gimp_text_layer_set_hint_style)
-gboolean              gimp_text_layer_set_hinting        (gint32                 layer_ID,
-                                                          gboolean               hinting,
-                                                          gboolean               autohint);
 
 
 G_END_DECLS
diff --git a/libgimp/gimptexttool_pdb.c b/libgimp/gimptexttool_pdb.c
index 4051295..1373fd8 100644
--- a/libgimp/gimptexttool_pdb.c
+++ b/libgimp/gimptexttool_pdb.c
@@ -168,157 +168,3 @@ gimp_text_get_extents_fontname (const gchar  *text,
 
   return success;
 }
-
-/**
- * gimp_text:
- * @image_ID: The image.
- * @drawable_ID: The affected drawable: (-1 for a new text layer).
- * @x: The x coordinate for the left of the text bounding box.
- * @y: The y coordinate for the top of the text bounding box.
- * @text: The text to generate (in UTF-8 encoding).
- * @border: The size of the border.
- * @antialias: Antialiasing.
- * @size: The size of text in either pixels or points.
- * @size_type: The units of specified size.
- * @foundry: The font foundry.
- * @family: The font family.
- * @weight: The font weight.
- * @slant: The font slant.
- * @set_width: The font set-width.
- * @spacing: The font spacing.
- * @registry: The font registry.
- * @encoding: The font encoding.
- *
- * Deprecated: Use gimp_text_fontname() instead.
- *
- * Returns: The new text layer or -1 if no layer was created.
- **/
-gint32
-gimp_text (gint32        image_ID,
-           gint32        drawable_ID,
-           gdouble       x,
-           gdouble       y,
-           const gchar  *text,
-           gint          border,
-           gboolean      antialias,
-           gdouble       size,
-           GimpSizeType  size_type,
-           const gchar  *foundry,
-           const gchar  *family,
-           const gchar  *weight,
-           const gchar  *slant,
-           const gchar  *set_width,
-           const gchar  *spacing,
-           const gchar  *registry,
-           const gchar  *encoding)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gint32 text_layer_ID = -1;
-
-  return_vals = gimp_run_procedure ("gimp-text",
-                                    &nreturn_vals,
-                                    GIMP_PDB_IMAGE, image_ID,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_FLOAT, x,
-                                    GIMP_PDB_FLOAT, y,
-                                    GIMP_PDB_STRING, text,
-                                    GIMP_PDB_INT32, border,
-                                    GIMP_PDB_INT32, antialias,
-                                    GIMP_PDB_FLOAT, size,
-                                    GIMP_PDB_INT32, size_type,
-                                    GIMP_PDB_STRING, foundry,
-                                    GIMP_PDB_STRING, family,
-                                    GIMP_PDB_STRING, weight,
-                                    GIMP_PDB_STRING, slant,
-                                    GIMP_PDB_STRING, set_width,
-                                    GIMP_PDB_STRING, spacing,
-                                    GIMP_PDB_STRING, registry,
-                                    GIMP_PDB_STRING, encoding,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    text_layer_ID = return_vals[1].data.d_layer;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return text_layer_ID;
-}
-
-/**
- * gimp_text_get_extents:
- * @text: The text to generate (in UTF-8 encoding).
- * @size: The size of text in either pixels or points.
- * @size_type: The units of specified size.
- * @foundry: The font foundry.
- * @family: The font family.
- * @weight: The font weight.
- * @slant: The font slant.
- * @set_width: The font set-width.
- * @spacing: The font spacing.
- * @registry: The font registry.
- * @encoding: The font encoding.
- * @width: The width of the specified font.
- * @height: The height of the specified font.
- * @ascent: The ascent of the specified font.
- * @descent: The descent of the specified font.
- *
- * Deprecated: Use gimp_text_get_extents_fontname() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_text_get_extents (const gchar  *text,
-                       gdouble       size,
-                       GimpSizeType  size_type,
-                       const gchar  *foundry,
-                       const gchar  *family,
-                       const gchar  *weight,
-                       const gchar  *slant,
-                       const gchar  *set_width,
-                       const gchar  *spacing,
-                       const gchar  *registry,
-                       const gchar  *encoding,
-                       gint         *width,
-                       gint         *height,
-                       gint         *ascent,
-                       gint         *descent)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-text-get-extents",
-                                    &nreturn_vals,
-                                    GIMP_PDB_STRING, text,
-                                    GIMP_PDB_FLOAT, size,
-                                    GIMP_PDB_INT32, size_type,
-                                    GIMP_PDB_STRING, foundry,
-                                    GIMP_PDB_STRING, family,
-                                    GIMP_PDB_STRING, weight,
-                                    GIMP_PDB_STRING, slant,
-                                    GIMP_PDB_STRING, set_width,
-                                    GIMP_PDB_STRING, spacing,
-                                    GIMP_PDB_STRING, registry,
-                                    GIMP_PDB_STRING, encoding,
-                                    GIMP_PDB_END);
-
-  *width = 0;
-  *height = 0;
-  *ascent = 0;
-  *descent = 0;
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  if (success)
-    {
-      *width = return_vals[1].data.d_int32;
-      *height = return_vals[2].data.d_int32;
-      *ascent = return_vals[3].data.d_int32;
-      *descent = return_vals[4].data.d_int32;
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
diff --git a/libgimp/gimptexttool_pdb.h b/libgimp/gimptexttool_pdb.h
index 9745460..51ab438 100644
--- a/libgimp/gimptexttool_pdb.h
+++ b/libgimp/gimptexttool_pdb.h
@@ -50,40 +50,6 @@ gboolean gimp_text_get_extents_fontname (const gchar  *text,
                                          gint         *height,
                                          gint         *ascent,
                                          gint         *descent);
-GIMP_DEPRECATED_FOR(gimp_text_fontname)
-gint32   gimp_text                      (gint32        image_ID,
-                                         gint32        drawable_ID,
-                                         gdouble       x,
-                                         gdouble       y,
-                                         const gchar  *text,
-                                         gint          border,
-                                         gboolean      antialias,
-                                         gdouble       size,
-                                         GimpSizeType  size_type,
-                                         const gchar  *foundry,
-                                         const gchar  *family,
-                                         const gchar  *weight,
-                                         const gchar  *slant,
-                                         const gchar  *set_width,
-                                         const gchar  *spacing,
-                                         const gchar  *registry,
-                                         const gchar  *encoding);
-GIMP_DEPRECATED_FOR(gimp_text_get_extents_fontname)
-gboolean gimp_text_get_extents          (const gchar  *text,
-                                         gdouble       size,
-                                         GimpSizeType  size_type,
-                                         const gchar  *foundry,
-                                         const gchar  *family,
-                                         const gchar  *weight,
-                                         const gchar  *slant,
-                                         const gchar  *set_width,
-                                         const gchar  *spacing,
-                                         const gchar  *registry,
-                                         const gchar  *encoding,
-                                         gint         *width,
-                                         gint         *height,
-                                         gint         *ascent,
-                                         gint         *descent);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpvectors_pdb.c b/libgimp/gimpvectors_pdb.c
index 39ff13b..9d6a732 100644
--- a/libgimp/gimpvectors_pdb.c
+++ b/libgimp/gimpvectors_pdb.c
@@ -951,50 +951,6 @@ gimp_vectors_bezier_stroke_new_ellipse (gint32  vectors_ID,
 }
 
 /**
- * gimp_vectors_to_selection:
- * @vectors_ID: The vectors object to render to the selection.
- * @operation: The desired operation with current selection.
- * @antialias: Antialias selection.
- * @feather: Feather selection.
- * @feather_radius_x: Feather radius x.
- * @feather_radius_y: Feather radius y.
- *
- * Deprecated: Use gimp_image_select_item() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: 2.4
- **/
-gboolean
-gimp_vectors_to_selection (gint32         vectors_ID,
-                           GimpChannelOps operation,
-                           gboolean       antialias,
-                           gboolean       feather,
-                           gdouble        feather_radius_x,
-                           gdouble        feather_radius_y)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-vectors-to-selection",
-                                    &nreturn_vals,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_INT32, operation,
-                                    GIMP_PDB_INT32, antialias,
-                                    GIMP_PDB_INT32, feather,
-                                    GIMP_PDB_FLOAT, feather_radius_x,
-                                    GIMP_PDB_FLOAT, feather_radius_y,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
  * gimp_vectors_import_from_file:
  * @image_ID: The image.
  * @filename: The name of the SVG file to import.
diff --git a/libgimp/gimpvectors_pdb.h b/libgimp/gimpvectors_pdb.h
index 8478534..e9304fe 100644
--- a/libgimp/gimpvectors_pdb.h
+++ b/libgimp/gimpvectors_pdb.h
@@ -119,13 +119,6 @@ gint                  gimp_vectors_bezier_stroke_new_ellipse (gint32
                                                               gdouble                 radius_x,
                                                               gdouble                 radius_y,
                                                               gdouble                 angle);
-GIMP_DEPRECATED_FOR(gimp_image_select_item)
-gboolean              gimp_vectors_to_selection              (gint32                  vectors_ID,
-                                                              GimpChannelOps          operation,
-                                                              gboolean                antialias,
-                                                              gboolean                feather,
-                                                              gdouble                 feather_radius_x,
-                                                              gdouble                 feather_radius_y);
 gboolean              gimp_vectors_import_from_file          (gint32                  image_ID,
                                                               const gchar            *filename,
                                                               gboolean                merge,
diff --git a/pdb/Makefile.am b/pdb/Makefile.am
index 47d0564..4aa4bcc 100644
--- a/pdb/Makefile.am
+++ b/pdb/Makefile.am
@@ -7,14 +7,12 @@ pdb_groups = \
        groups/brushes.pdb              \
        groups/buffer.pdb               \
        groups/channel.pdb              \
-       groups/color.pdb                \
        groups/context.pdb              \
        groups/debug.pdb                \
        groups/display.pdb              \
        groups/drawable.pdb             \
        groups/drawable_color.pdb       \
        groups/drawable_edit.pdb        \
-       groups/drawable_transform.pdb   \
        groups/dynamics.pdb             \
        groups/edit.pdb                 \
        groups/fileops.pdb              \
@@ -44,7 +42,6 @@ pdb_groups = \
        groups/palette.pdb              \
        groups/palette_select.pdb       \
        groups/palettes.pdb             \
-       groups/paths.pdb                \
        groups/pattern.pdb              \
        groups/pattern_select.pdb       \
        groups/patterns.pdb             \
@@ -53,10 +50,8 @@ pdb_groups = \
        groups/procedural_db.pdb        \
        groups/progress.pdb             \
        groups/selection.pdb            \
-       groups/selection_tools.pdb      \
        groups/text_layer.pdb           \
        groups/text_tool.pdb            \
-       groups/transform_tools.pdb      \
        groups/unit.pdb                 \
        groups/vectors.pdb
 
diff --git a/pdb/groups.pl b/pdb/groups.pl
index d5f9d16..f6e8fe7 100644
--- a/pdb/groups.pl
+++ b/pdb/groups.pl
@@ -5,14 +5,12 @@
     brushes
     buffer
     channel
-    color
     context
     debug
     display
     drawable
     drawable_color
     drawable_edit
-    drawable_transform
     dynamics
     edit
     fileops
@@ -42,7 +40,6 @@
     palette
     palette_select
     palettes
-    paths
     pattern
     pattern_select
     patterns
@@ -51,10 +48,8 @@
     procedural_db
     progress
     selection
-    selection_tools
     text_layer
     text_tool
-    transform_tools
     unit
     vectors
 );
diff --git a/pdb/groups/brushes.pdb b/pdb/groups/brushes.pdb
index 4c5231c..0e60dd6 100644
--- a/pdb/groups/brushes.pdb
+++ b/pdb/groups/brushes.pdb
@@ -69,140 +69,6 @@ CODE
     );
 }
 
-sub brushes_get_brush {
-    &std_pdb_deprecated ('gimp-context-get-brush');
-
-    @outargs = (
-       { name => 'name', type => 'string',
-         desc => 'The brush name' },
-       { name => 'width', type => 'int32',
-         desc => 'The brush width' },
-       { name => 'height', type => 'int32',
-         desc => 'The brush height' },
-       { name => 'spacing', type => '0 <= int32 <= 1000',
-         desc => 'The brush spacing' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpBrush *brush = gimp_context_get_brush (context);
-
-  if (brush)
-    {
-      name    = g_strdup (gimp_object_get_name (brush));
-      width   = gimp_brush_get_width  (brush);
-      height  = gimp_brush_get_height (brush);
-      spacing = gimp_brush_get_spacing (brush);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub brushes_get_spacing {
-    &std_pdb_deprecated ('gimp-brush-get-spacing');
-
-    @outargs = (
-       { name => 'spacing', type => '0 <= int32 <= 1000',
-         desc => 'The brush spacing' }
-    );
-
-    %invoke = (
-       code =><<'CODE'
-{
-  GimpBrush *brush = gimp_context_get_brush (context);
-
-  if (brush)
-    spacing = gimp_brush_get_spacing (brush);
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub brushes_set_spacing {
-    &std_pdb_deprecated ('gimp-brush-set-spacing');
-
-    @inargs = (
-       { name => 'spacing', type => '0 <= int32 <= 1000',
-         desc => 'The brush spacing' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  gimp_brush_set_spacing (gimp_context_get_brush (context), spacing);
-}
-CODE
-    );
-}
-
-sub brushes_get_brush_data {
-    &std_pdb_deprecated ('gimp-brush-get-pixels');
-
-    @inargs = (
-       { name => 'name', type => 'string', null_ok => 1,
-         desc => 'The brush name ("" means current active brush)' }
-    );
-
-    @outargs = (
-       { name => 'actual_name', type => 'string',
-         desc => 'The brush name' },
-       { name => 'opacity', type => '0 <= float <= 100',
-         desc => 'The brush opacity' },
-       { name => 'spacing', type => '0 <= int32 <= 1000',
-         desc => 'The brush spacing' },
-       { name => 'paint_mode', type => 'enum GimpLayerMode',
-          default => 'GIMP_LAYER_MODE_NORMAL',
-         desc => 'The paint mode' },
-       { name => 'width', type => 'int32',
-         desc => 'The brush width' },
-       { name => 'height', type => 'int32',
-         desc => 'The brush height' },
-       { name => 'mask_data', type => 'int8array',
-         desc => 'The brush mask data',
-         array => { name => 'length',
-                    desc => 'Length of brush mask data' } }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpBrush *brush;
-
-  if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-    paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-  if (name && strlen (name))
-    brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
-  else
-    brush = gimp_context_get_brush (context);
-
-  if (brush)
-    {
-      GimpTempBuf *mask = gimp_brush_get_mask (brush);
-
-      actual_name = g_strdup (gimp_object_get_name (brush));
-      opacity     = 1.0;
-      spacing     = gimp_brush_get_spacing (brush);
-      paint_mode  = 0;
-      width       = gimp_brush_get_width  (brush);
-      height      = gimp_brush_get_height (brush);
-      length      = gimp_temp_buf_get_data_size (mask);
-      mask_data   = g_memdup (gimp_temp_buf_get_data (mask), length);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-
 @headers = qw(<string.h>
               "core/gimp.h"
               "core/gimpbrush.h"
@@ -212,10 +78,7 @@ CODE
               "gimppdb-utils.h");
 
 @procs = qw(brushes_refresh
-            brushes_get_list
-            brushes_get_brush
-            brushes_get_spacing brushes_set_spacing
-            brushes_get_brush_data);
+            brushes_get_list);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/context.pdb b/pdb/groups/context.pdb
index 0ae7b62..7449306 100644
--- a/pdb/groups/context.pdb
+++ b/pdb/groups/context.pdb
@@ -2853,39 +2853,6 @@ CODE
     );
 }
 
-sub context_get_transform_recursion {
-    &std_pdb_deprecated();
-
-    @outargs = (
-        { name => 'transform_recursion', type => '1 <= int32',
-          desc => 'This returns always 3 and is meaningless' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  transform_recursion = 3;
-}
-CODE
-    );
-}
-
-sub context_set_transform_recursion {
-    &std_pdb_deprecated();
-
-    @inargs = (
-        { name => 'transform_recursion', type => '1 <= int32', dead => 1,
-          desc => 'This parameter is ignored' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-}
-CODE
-    );
-}
-
 sub context_get_ink_size {
     $blurb = 'Get ink blob size in pixels.';
     $help = 'Get the ink blob size in pixels for ink tool.';
@@ -3437,7 +3404,6 @@ CODE
             context_get_interpolation context_set_interpolation
             context_get_transform_direction context_set_transform_direction
             context_get_transform_resize context_set_transform_resize
-            context_get_transform_recursion context_set_transform_recursion
             context_get_ink_size context_set_ink_size
             context_get_ink_angle context_set_ink_angle
             context_get_ink_size_sensitivity context_set_ink_size_sensitivity
diff --git a/pdb/groups/drawable.pdb b/pdb/groups/drawable.pdb
index a6b9fbf..1816830 100644
--- a/pdb/groups/drawable.pdb
+++ b/pdb/groups/drawable.pdb
@@ -704,26 +704,6 @@ CODE
     );
 }
 
-sub drawable_set_image {
-    &std_pdb_deprecated();
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The drawable' },
-       { name => 'image', type => 'image',
-         desc => 'The image' }
-    );
-
-    %invoke = (
-       code =><<'CODE'
-{
-  if (image != gimp_item_get_image (GIMP_ITEM (drawable)))
-    success = FALSE;
-}
-CODE
-    );
-}
-
 sub drawable_thumbnail {
     $blurb = 'Get a thumbnail of a drawable.';
 
@@ -996,6 +976,7 @@ CODE
               "core/gimp.h"
               "core/gimpchannel-select.h"
               "core/gimpdrawable-offset.h"
+              "core/gimpimage.h"
               "core/gimptempbuf.h"
               "gimppdb-utils.h"
               "gimppdbcontext.h"
@@ -1012,7 +993,6 @@ CODE
             drawable_width
             drawable_height
             drawable_offsets
-            drawable_set_image
             drawable_mask_bounds
             drawable_mask_intersect
             drawable_merge_shadow
diff --git a/pdb/groups/edit.pdb b/pdb/groups/edit.pdb
index d0d8987..9cb69af 100644
--- a/pdb/groups/edit.pdb
+++ b/pdb/groups/edit.pdb
@@ -506,536 +506,6 @@ CODE
     );
 }
 
-sub edit_clear {
-    $blurb = 'Clear selected area of drawable.';
-
-    $help = <<'HELP';
-This procedure clears the specified drawable. If the drawable has an
-alpha channel, the cleared pixels will become transparent. If the
-drawable does not have an alpha channel, cleared pixels will be set to
-the background color. This procedure only affects regions within a
-selection if there is a selection active.
-HELP
-
-    &std_pdb_misc;
-
-    $deprecated = 'gimp-drawable-edit-clear';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The drawable to clear from' }
-    );
-
-    %invoke = (
-       code => <<CODE
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                 GIMP_PDB_ITEM_CONTENT, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-    {
-      gimp_drawable_edit_clear (drawable, context);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub edit_fill {
-    $blurb = 'Fill selected area of drawable.';
-
-    $help = <<'HELP';
-This procedure fills the specified drawable with the fill mode. If the
-fill mode is foreground, the current foreground color is used. If the
-fill mode is background, the current background color is used. Other
-fill modes should not be used. This procedure only affects regions
-within a selection if there is a selection active. If you want to fill
-the whole drawable, regardless of the selection, use
-gimp_drawable_fill().
-HELP
-
-    &std_pdb_misc;
-    $author .= ' & Raphael Quinet';
-    $date = '1995-2000';
-
-    $deprecated = 'gimp-drawable-edit-fill';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => "The drawable to fill to" },
-       { name => 'fill_type', type => 'enum GimpFillType',
-         desc => 'The type of fill' }
-    );
-
-    %invoke = (
-       code => <<CODE
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                 GIMP_PDB_ITEM_CONTENT, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-    {
-      GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
-
-      if (gimp_fill_options_set_by_fill_type (options, context,
-                                              fill_type, error))
-        {
-          gimp_drawable_edit_fill (drawable, options, NULL);
-        }
-      else
-        success = FALSE;
-
-      g_object_unref (options);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub edit_bucket_fill {
-    $blurb = <<'BLURB';
-Fill the area specified either by the current selection if there is one, or by
-a seed fill starting at the specified coordinates.
-BLURB
-
-    $help = <<'HELP';
-This tool requires information on the paint application mode, and the
-fill mode, which can either be in the foreground color, or in the
-currently active pattern. If there is no selection, a seed fill is
-executed at the specified coordinates and extends outward in keeping
-with the threshold parameter. If there is a selection in the target
-image, the threshold, sample merged, x, and y arguments are unused. If
-the sample_merged parameter is TRUE, the data of the composite
-image will be used instead of that for the specified drawable.  This
-is equivalent to sampling for colors after merging all visible
-layers. In the case of merged sampling, the x and y coordinates are
-relative to the image's origin; otherwise, they are relative to the
-drawable's origin.
-HELP
-
-    &std_pdb_misc;
-
-    $deprecated = 'gimp-drawable-edit-bucket-fill';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The affected drawable' },
-       { name => 'fill_mode', type => 'enum GimpBucketFillMode',
-         desc => 'The type of fill' },
-       { name => paint_mode, type => 'enum GimpLayerMode',
-          default => 'GIMP_LAYER_MODE_NORMAL',
-         desc => 'The paint application mode' },
-       { name => 'opacity', type => '0 <= float <= 100',
-         desc => 'The opacity of the final bucket fill' },
-       { name => 'threshold', type => '0 <= float <= 255',
-         desc => "The threshold determines how extensive the seed fill will
-                  be. It's value is specified in terms of intensity levels.
-                   This parameter is only valid when there is no selection in
-                  the specified image." },
-       { name => 'sample_merged', type => 'boolean',
-         desc => 'Use the composite image, not the drawable' },
-       { name => 'x', type => 'float',
-         desc => "The x coordinate of this bucket fill's application.
-                  This parameter is only valid when there is no selection
-                  in the specified image." },
-       { name => 'y', type => 'float',
-         desc => "The y coordinate of this bucket fill's application.
-                  This parameter is only valid when there is no selection
-                  in the specified image." }
-    );
-
-    %invoke = (
-        headers => [ qw ("core/gimpdrawable-bucket-fill.h"
-                        "core/gimpchannel.h") ],
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                 GIMP_PDB_ITEM_CONTENT, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-    {
-      GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (drawable));
-      GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
-
-      if (gimp_fill_options_set_by_fill_mode (options, context,
-                                              fill_mode, error))
-        {
-          if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-            paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-          gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
-          gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
-
-          if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
-            {
-              gimp_drawable_edit_fill (drawable, options, NULL);
-            }
-          else
-            {
-              gimp_drawable_bucket_fill (drawable, options,
-                                         FALSE /* don't fill transparent */,
-                                         GIMP_SELECT_CRITERION_COMPOSITE,
-                                         threshold / 255.0,
-                                         sample_merged,
-                                         FALSE /* no diagonal neighbors */,
-                                         x, y);
-           }
-        }
-      else
-        success = FALSE;
-
-      g_object_unref (options);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub edit_bucket_fill_full {
-    $blurb = <<'BLURB';
-Fill the area specified either by the current selection if there is one, or by
-a seed fill starting at the specified coordinates.
-BLURB
-
-    $help = <<'HELP';
-This tool requires information on the paint application mode, and the
-fill mode, which can either be in the foreground color, or in the
-currently active pattern. If there is no selection, a seed fill is
-executed at the specified coordinates and extends outward in keeping
-with the threshold parameter. If there is a selection in the target
-image, the threshold, sample merged, x, and y arguments are unused. If
-the sample_merged parameter is TRUE, the data of the composite
-image will be used instead of that for the specified drawable.  This
-is equivalent to sampling for colors after merging all visible
-layers. In the case of merged sampling, the x and y coordinates are
-relative to the image's origin; otherwise, they are relative to the
-drawable's origin.
-HELP
-
-    &david_pdb_misc('2006', '2.4');
-
-    $deprecated = 'gimp-drawable-edit-bucket-fill';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The affected drawable' },
-       { name => 'fill_mode', type => 'enum GimpBucketFillMode',
-         desc => 'The type of fill' },
-       { name => paint_mode, type => 'enum GimpLayerMode',
-          default => 'GIMP_LAYER_MODE_NORMAL',
-         desc => 'The paint application mode' },
-       { name => 'opacity', type => '0 <= float <= 100',
-         desc => 'The opacity of the final bucket fill' },
-       { name => 'threshold', type => '0 <= float <= 255',
-         desc => "The threshold determines how extensive the seed fill will
-                  be. It's value is specified in terms of intensity levels.
-                   This parameter is only valid when there is no selection in
-                  the specified image." },
-       { name => 'sample_merged', type => 'boolean',
-         desc => 'Use the composite image, not the drawable' },
-       { name => 'fill_transparent', type => 'boolean',
-         desc => "Whether to consider transparent pixels for filling.
-                  If TRUE, transparency is considered as a unique fillable
-                  color." },
-       { name => 'select_criterion', type => 'enum GimpSelectCriterion',
-         desc => "The criterion used to determine color similarity.
-                  SELECT_CRITERION_COMPOSITE is the standard choice.
-                  " },
-       { name => 'x', type => 'float',
-         desc => "The x coordinate of this bucket fill's application.
-                  This parameter is only valid when there is no selection
-                  in the specified image." },
-       { name => 'y', type => 'float',
-         desc => "The y coordinate of this bucket fill's application.
-                  This parameter is only valid when there is no selection
-                  in the specified image." }
-    );
-
-    %invoke = (
-        headers => [ qw ("core/gimpdrawable-bucket-fill.h"
-                        "core/gimpchannel.h") ],
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                 GIMP_PDB_ITEM_CONTENT, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-    {
-      GimpImage       *image   = gimp_item_get_image (GIMP_ITEM (drawable));
-      GimpFillOptions *options = gimp_fill_options_new (gimp, NULL, FALSE);
-
-      if (gimp_fill_options_set_by_fill_mode (options, context,
-                                              fill_mode, error))
-        {
-          if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-            paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-          gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
-          gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
-
-          if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
-            {
-              gimp_drawable_edit_fill (drawable, options, NULL);
-            }
-          else
-            {
-              gimp_drawable_bucket_fill (drawable, options,
-                                         fill_transparent,
-                                         select_criterion,
-                                         threshold / 255.0,
-                                         sample_merged,
-                                         FALSE /* no diagonal neighbors */,
-                                         x, y);
-           }
-        }
-      else
-        success = FALSE;
-
-      g_object_unref (options);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub edit_blend {
-    $blurb = <<'BLURB';
-Blend between the starting and ending coordinates with the specified
-blend mode and gradient type.
-BLURB
-
-    $help = <<'HELP';
-This tool requires information on the paint application mode, the
-blend mode, and the gradient type. It creates the specified variety of
-blend using the starting and ending coordinates as defined for each
-gradient type.
-For shapeburst gradient types, the context's distance metric is also
-relevant and can be updated with gimp_context_set_distance_metric().
-HELP
-
-    &std_pdb_misc;
-
-    $deprecated = 'gimp-drawable-edit-gradient-fill';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The affected drawable' },
-        { name => 'blend_mode', type => 'enum GimpBlendMode',
-         desc => 'The type of blend' },
-       { name => 'paint_mode', type => 'enum GimpLayerMode',
-          default => 'GIMP_LAYER_MODE_NORMAL',
-         desc => 'The paint application mode' },
-       { name => 'gradient_type',  type => 'enum GimpGradientType',
-         desc => 'The type of gradient' },
-       { name => 'opacity', type => '0 <= float <= 100',
-         desc => 'The opacity of the final blend' },
-       { name => 'offset', type => '0 <= float',
-         desc => 'Offset relates to the starting and ending coordinates
-                  specified for the blend. This parameter is mode dependent.' },
-       { name => 'repeat', type => 'enum GimpRepeatMode',
-         desc => 'Repeat mode' },
-       { name => 'reverse', type => 'boolean',
-         desc => 'Use the reverse gradient' },
-       { name => 'supersample', type => 'boolean',
-         desc => 'Do adaptive supersampling' },
-       { name => 'max_depth', type => '1 <= int32 <= 9', no_validate => 1,
-         desc => 'Maximum recursion levels for supersampling' },
-       { name => 'threshold', type => '0 <= float <= 4', no_validate => 1,
-         desc => 'Supersampling threshold' },
-       { name => 'dither', type => 'boolean',
-         desc => 'Use dithering to reduce banding' },
-       { name => 'x1', type => 'float',
-         desc => "The x coordinate of this blend's starting point" },
-       { name => 'y1', type => 'float',
-         desc => "The y coordinate of this blend's starting point" },
-       { name => 'x2', type => 'float',
-         desc => "The x coordinate of this blend's ending point" },
-       { name => 'y2', type => 'float',
-         desc => "The y coordinate of this blend's ending point" }
-    );
-
-    %invoke = (
-        headers => [ qw("core/gimp-gradients.h" "core/gimpdrawable-gradient.h") ],
-       code => <<'CODE'
-{
-  success = (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                        GIMP_PDB_ITEM_CONTENT, error) &&
-             gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error));
-
-  if (success)
-    {
-      if (supersample)
-        {
-          if (max_depth < 1 || max_depth > 9)
-            success = FALSE;
-
-          if (threshold < 0.0 || threshold > 4.0)
-            success = FALSE;
-       }
-      else
-        {
-         max_depth = CLAMP (max_depth, 1, 9);
-         threshold = CLAMP (threshold, 0.0, 4.0);
-       }
-    }
-
-  if (success)
-    {
-      GimpGradient *gradient;
-
-      if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
-        paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
-
-      if (progress)
-        gimp_progress_start (progress, FALSE, _("Gradient"));
-
-      switch (blend_mode)
-        {
-        case GIMP_BLEND_FG_BG_RGB:
-          gradient = gimp_gradients_get_fg_bg_rgb (context->gimp);
-          break;
-
-        case GIMP_BLEND_FG_BG_HSV:
-          gradient = gimp_gradients_get_fg_bg_hsv_cw (context->gimp);
-          break;
-
-        case GIMP_BLEND_FG_TRANSPARENT:
-          gradient = gimp_gradients_get_fg_transparent (context->gimp);
-          break;
-
-        case GIMP_BLEND_CUSTOM:
-       default:
-          gradient = gimp_context_get_gradient (context);
-          break;
-        }
-
-      gimp_drawable_gradient (drawable,
-                              context,
-                              gradient,
-                              GIMP_PDB_CONTEXT (context)->distance_metric,
-                              paint_mode,
-                              gradient_type,
-                              opacity / 100.0,
-                              offset, repeat, reverse,
-                              GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                              supersample, max_depth,
-                              threshold, dither,
-                              x1, y1, x2, y2,
-                              progress);
-
-      if (progress)
-        gimp_progress_end (progress);
-    }
-}
-CODE
-    );
-}
-
-sub edit_stroke {
-    $blurb = 'Stroke the current selection';
-
-    $help = <<'HELP';
-This procedure strokes the current selection, painting along the selection
-boundary with the active brush and foreground color. The paint is applied to
-the specified drawable regardless of the active selection.
-HELP
-
-    &std_pdb_misc;
-
-    $deprecated = 'gimp-drawable-edit-stroke-selection';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The drawable to stroke to' }
-    );
-
-    %invoke = (
-       headers => [ qw("core/gimpstrokeoptions.h") ],
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                 GIMP_PDB_ITEM_CONTENT, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
-    {
-      GimpImage         *image = gimp_item_get_image (GIMP_ITEM (drawable));
-      GimpStrokeOptions *options;
-      GimpPaintOptions  *paint_options;
-
-      options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
-
-      paint_options =
-        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
-      paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
-
-      success = gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)),
-                                  drawable, context, options, paint_options,
-                                  TRUE, progress, error);
-
-      g_object_unref (paint_options);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub edit_stroke_vectors {
-    $blurb = 'Stroke the specified vectors object';
-
-    $help = <<'HELP';
-This procedure strokes the specified vectors object, painting along the
-path with the active brush and foreground color.
-HELP
-
-    &simon_pdb_misc('2006', '2.4');
-
-    $deprecated = 'gimp-drawable-edit-stroke-item';
-
-    @inargs = (
-       { name => 'drawable', type => 'drawable',
-         desc => 'The drawable to stroke to' },
-       { name => 'vectors', type => 'vectors',
-          desc => 'The vectors object' }
-    );
-
-    %invoke = (
-       headers => [ qw("core/gimpstrokeoptions.h") ],
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
-                                 GIMP_PDB_ITEM_CONTENT, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
-      gimp_pdb_item_is_attached (GIMP_ITEM (vectors),
-                                 gimp_item_get_image (GIMP_ITEM (drawable)),
-                                 0, error))
-    {
-      GimpStrokeOptions *options;
-      GimpPaintOptions  *paint_options;
-
-      options = gimp_pdb_context_get_stroke_options (GIMP_PDB_CONTEXT (context));
-
-      paint_options =
-        gimp_pdb_context_get_paint_options (GIMP_PDB_CONTEXT (context), NULL);
-      paint_options = gimp_config_duplicate (GIMP_CONFIG (paint_options));
-
-      success = gimp_item_stroke (GIMP_ITEM (vectors),
-                                  drawable, context, options, paint_options,
-                                  TRUE, progress, error);
-
-      g_object_unref (paint_options);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 
 @headers = qw("libgimpconfig/gimpconfig.h"
               "core/gimp.h"
@@ -1057,14 +527,7 @@ CODE
             edit_named_copy
             edit_named_copy_visible
             edit_named_paste
-            edit_named_paste_as_new_image
-            edit_clear
-            edit_fill
-            edit_bucket_fill
-            edit_bucket_fill_full
-           edit_blend
-            edit_stroke
-            edit_stroke_vectors);
+            edit_named_paste_as_new_image);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/floating_sel.pdb b/pdb/groups/floating_sel.pdb
index fc26cc3..54dacab 100644
--- a/pdb/groups/floating_sel.pdb
+++ b/pdb/groups/floating_sel.pdb
@@ -164,40 +164,6 @@ CODE
     );
 }
 
-sub floating_sel_rigor {
-    &std_pdb_deprecated ();
-
-    @inargs = (
-       { name => 'floating_sel', type => 'layer', dead => 1,
-         desc => 'The floating selection' },
-       { name => 'undo', type => 'boolean', dead => 1 }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-}
-CODE
-    );
-}
-
-sub floating_sel_relax {
-    &std_pdb_deprecated ();
-
-    @inargs = (
-       { name => 'floating_sel', type => 'layer', dead => 1,
-         desc => 'The floating selection' },
-       { name => 'undo', type => 'boolean', dead => 1 }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-}
-CODE
-    );
-}
-
 
 @headers = qw("core/gimpimage.h"
               "core/gimplayer-floating-selection.h"
@@ -208,9 +174,7 @@ CODE
 @procs = qw(floating_sel_remove
             floating_sel_anchor
             floating_sel_to_layer
-            floating_sel_attach
-            floating_sel_rigor
-            floating_sel_relax);
+            floating_sel_attach);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/gradients.pdb b/pdb/groups/gradients.pdb
index 376de2f..e86e1e4 100644
--- a/pdb/groups/gradients.pdb
+++ b/pdb/groups/gradients.pdb
@@ -69,187 +69,6 @@ CODE
     );
 }
 
-sub gradients_sample_uniform {
-    &std_pdb_deprecated ('gimp-gradient-get-uniform-samples');
-
-    @inargs = (
-       { name => 'num_samples', type => '2 <= int32',
-         desc => 'The number of samples to take' },
-       { name => 'reverse', type => 'boolean',
-         desc => 'Use the reverse gradient' }
-    );
-
-    @outargs = (
-        { name => 'color_samples', type => 'floatarray',
-         desc => 'Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }',
-         array => { name => 'array_length', no_lib => 1,
-                    desc => 'Length of the color_samples array (4 *
-                             num_samples)' } }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpGradient        *gradient;
-  GimpGradientSegment *seg = NULL;
-  gdouble              pos, delta;
-  GimpRGB              color;
-  gdouble             *pv;
-
-  pos   = 0.0;
-  delta = 1.0 / (num_samples - 1);
-
-  array_length = num_samples * 4;
-
-  pv = color_samples = g_new (gdouble, array_length);
-
-  gradient = gimp_context_get_gradient (context);
-
-  while (num_samples--)
-    {
-      seg = gimp_gradient_get_color_at (gradient, context, seg,
-                                        pos, reverse,
-                                        GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                        &color);
-
-      *pv++ = color.r;
-      *pv++ = color.g;
-      *pv++ = color.b;
-      *pv++ = color.a;
-
-      pos += delta;
-    }
-}
-CODE
-    );
-}
-
-sub gradients_sample_custom {
-    &std_pdb_deprecated ('gimp-gradient-get-custom-samples');
-
-    @inargs = (
-       { name  => 'positions', type  => 'floatarray',
-         desc  => 'The list of positions to sample along the gradient',
-         array => { name => 'num_samples',
-                    desc => 'The number of samples to take' } },
-       { name => 'reverse', type => 'boolean',
-         desc => 'Use the reverse gradient' }
-    );
-
-    @outargs = (
-        { name => 'color_samples', type => 'floatarray',
-         desc => 'Color samples: { R1, G1, B1, A1, ..., Rn, Gn, Bn, An }',
-         array => { name => 'array_length', no_lib => 1,
-                    desc => 'Length of the color_samples array (4 *
-                             num_samples)' } }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpGradient        *gradient;
-  GimpGradientSegment *seg = NULL;
-  GimpRGB              color;
-  gdouble             *pv;
-
-  array_length = num_samples * 4;
-
-  pv = color_samples = g_new (gdouble, array_length);
-
-  gradient = gimp_context_get_gradient (context);
-
-  while (num_samples--)
-    {
-      seg = gimp_gradient_get_color_at (gradient, context, seg,
-                                        *positions, reverse,
-                                        GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                        &color);
-
-      *pv++ = color.r;
-      *pv++ = color.g;
-      *pv++ = color.b;
-      *pv++ = color.a;
-
-      positions++;
-    }
-}
-CODE
-    );
-}
-
-sub gradients_get_gradient_data {
-    &std_pdb_deprecated ('gimp-gradient-get-uniform-samples');
-
-    @inargs = (
-       { name => 'name', type => 'string', null_ok => 1,
-         desc => 'The gradient name ("" means current active gradient)' },
-       { name => 'sample_size', type => '1 <= int32 <= 10000',
-         no_validate => 1,
-         desc => 'Size of the sample to return when the gradient is changed' },
-       { name => 'reverse', type => 'boolean',
-         desc => 'Use the reverse gradient' }
-    );
-
-    @outargs = (
-       { name => 'actual_name', type => 'string',
-         desc => 'The gradient name' },
-       { name => 'grad_data', type => 'floatarray',
-         desc => 'The gradient sample data',
-         array => { name => 'width',
-                    desc => 'The gradient sample width (r,g,b,a)' } }
-    );
-
-    %invoke = (
-       code => <<"CODE"
-{
-  GimpGradient *gradient;
-
-  if (sample_size < 1 || sample_size > 10000)
-    sample_size = GIMP_GRADIENT_DEFAULT_SAMPLE_SIZE;
-
-  if (name && strlen (name))
-    gradient = gimp_pdb_get_gradient (gimp, name, FALSE, error);
-  else
-    gradient = gimp_context_get_gradient (context);
-
-  if (gradient)
-    {
-      GimpGradientSegment *seg = NULL;
-      gdouble             *pv;
-      gdouble              pos, delta;
-      GimpRGB              color;
-
-      pos   = 0.0;
-      delta = 1.0 / (sample_size - 1);
-
-      actual_name = g_strdup (gimp_object_get_name (gradient));
-      grad_data   = g_new (gdouble, sample_size * 4);
-      width       = sample_size * 4;
-
-      pv = grad_data;
-
-      while (sample_size--)
-       {
-         seg = gimp_gradient_get_color_at (gradient, context, seg,
-                                            pos, reverse,
-                                            GIMP_GRADIENT_BLEND_RGB_PERCEPTUAL,
-                                            &color);
-
-         *pv++ = color.r;
-         *pv++ = color.g;
-         *pv++ = color.b;
-         *pv++ = color.a;
-
-         pos += delta;
-       }
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 
 @headers = qw(<string.h>
               "core/gimp.h"
@@ -259,10 +78,7 @@ CODE
               "gimppdb-utils.h");
 
 @procs = qw(gradients_refresh
-            gradients_get_list
-           gradients_sample_uniform
-            gradients_sample_custom
-            gradients_get_gradient_data);
+            gradients_get_list);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/image.pdb b/pdb/groups/image.pdb
index abf862c..afdd9da 100644
--- a/pdb/groups/image.pdb
+++ b/pdb/groups/image.pdb
@@ -239,22 +239,6 @@ CODE
     );
 }
 
-sub image_free_shadow {
-    &std_pdb_deprecated ('gimp-drawable-free-shadow');
-
-    @inargs = (
-        { name => 'image', type => 'image', dead => 1,
-          desc => 'The image' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-}
-CODE
-    );
-}
-
 sub image_get_layers {
     $blurb = 'Returns the list of layers contained in the specified image.';
 
@@ -849,36 +833,6 @@ CODE
     );
 }
 
-sub image_add_layer {
-    &std_pdb_deprecated ('gimp-image-insert-layer');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'layer', type => 'layer',
-          desc => 'The layer' },
-        { name => 'position', type => 'int32',
-          desc => 'The layer position' }
-    );
-
-    $invoke{code} = <<'CODE';
-{
-  if (gimp_pdb_item_is_floating (GIMP_ITEM (layer), image, error) &&
-      gimp_pdb_image_is_base_type (image,
-                                   gimp_drawable_get_base_type (GIMP_DRAWABLE (layer)),
-                                   error))
-    {
-      success = gimp_image_add_layer (image, layer,
-                                      NULL, MAX (position, -1), TRUE);
-    }
-  else
-    {
-      success = FALSE;
-    }
-}
-CODE
-}
-
 sub image_insert_layer {
     $blurb = 'Add the specified layer to the image.';
 
@@ -964,61 +918,6 @@ CODE
     );
 }
 
-sub image_add_layer_mask {
-    &std_pdb_deprecated ('gimp-layer-add-mask');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'layer', type => 'layer',
-          desc => 'The layer to receive the mask' },
-        { name => 'mask', type => 'layer_mask',
-          desc => 'The mask to add to the layer' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  if (gimp_pdb_item_is_floating (GIMP_ITEM (mask), image, error) &&
-      gimp_pdb_item_is_not_group (GIMP_ITEM (layer), error))
-    success = (gimp_layer_add_mask (layer, mask, TRUE, error) == mask);
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub image_remove_layer_mask {
-    &std_pdb_deprecated ('gimp-layer-remove-mask');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'layer', type => 'layer',
-          desc => 'The layer from which to remove mask' },
-        { name => 'mode', type => 'enum GimpMaskApplyMode',
-          desc => 'Removal mode' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  GimpPDBItemModify modify = 0;
-
-  if (mode == GIMP_MASK_APPLY)
-    modify |= GIMP_PDB_ITEM_CONTENT;
-
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), image, modify, error) &&
-      gimp_layer_get_mask (layer))
-    gimp_layer_apply_mask (layer, mode, TRUE);
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 sub image_freeze_layers {
     $blurb = "Freeze the image's layer list.";
 
@@ -1095,35 +994,6 @@ CODE
     );
 }
 
-sub image_add_channel {
-    &std_pdb_deprecated ('gimp-image-insert-channel');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'channel', type => 'channel',
-          desc => 'The channel' },
-        { name => 'position', type => 'int32',
-          desc => 'The channel position' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  if (gimp_pdb_item_is_floating (GIMP_ITEM (channel), image, error))
-    {
-      success = gimp_image_add_channel (image, channel,
-                                        NULL, MAX (position, -1), TRUE);
-    }
-  else
-    {
-      success = FALSE;
-    }
-}
-CODE
-    );
-}
-
 sub image_insert_channel {
     $blurb = 'Add the specified channel to the image.';
 
@@ -1275,33 +1145,6 @@ CODE
     );
 }
 
-sub image_add_vectors {
-    &std_pdb_deprecated ('gimp-image-insert-vectors');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'vectors', type => 'vectors',
-          desc => 'The vectors object' },
-        { name => 'position', type => 'int32',
-          desc => 'The vectors objects position' }
-    );
-
-    $invoke{code} = <<'CODE';
-{
-  if (gimp_pdb_item_is_floating (GIMP_ITEM (vectors), image, error))
-    {
-      success = gimp_image_add_vectors (image, vectors,
-                                        NULL, MAX (position, -1), TRUE);
-    }
-  else
-    {
-      success = FALSE;
-    }
-}
-CODE
-}
-
 sub image_insert_vectors {
     $blurb = 'Add the specified vectors to the image.';
 
@@ -3096,7 +2939,6 @@ CODE
             image_get_precision
             image_get_default_new_layer_mode
             image_width image_height
-            image_free_shadow
             image_get_layers
             image_get_channels
             image_get_vectors
@@ -3106,18 +2948,17 @@ CODE
             image_floating_sel_attached_to
             image_pick_color
             image_pick_correlate_layer
-            image_add_layer image_insert_layer image_remove_layer
+            image_insert_layer image_remove_layer
             image_freeze_layers image_thaw_layers
-            image_add_channel image_insert_channel image_remove_channel
+            image_insert_channel image_remove_channel
             image_freeze_channels image_thaw_channels
-            image_add_vectors image_insert_vectors image_remove_vectors
+            image_insert_vectors image_remove_vectors
             image_freeze_vectors image_thaw_vectors
             image_get_item_position
             image_raise_item image_lower_item
             image_raise_item_to_top image_lower_item_to_bottom
             image_reorder_item
             image_flatten image_merge_visible_layers image_merge_down
-            image_add_layer_mask image_remove_layer_mask
             image_get_colormap image_set_colormap
             image_get_metadata image_set_metadata
             image_clean_all image_is_dirty
@@ -3147,11 +2988,7 @@ CODE
             image_get_parasite
             image_get_parasite_list);
 
-# For the lib parameter EXCLUDE functions #45 and #46, which are
-# image_add_layer_mask and image_remove_layer_mask.
-# If adding or removing functions, make sure the range below is
-# updated correctly!
-%exports = (app => [@procs], lib => [@procs[0..44,47..87]]);
+%exports = (app => [@procs], lib => [@procs]);
 
 $desc = 'Image';
 $doc_title = 'gimpimage';
diff --git a/pdb/groups/image_transform.pdb b/pdb/groups/image_transform.pdb
index 51c587b..b73dc80 100644
--- a/pdb/groups/image_transform.pdb
+++ b/pdb/groups/image_transform.pdb
@@ -126,37 +126,6 @@ CODE
     );
 }
 
-sub image_scale_full {
-    &std_pdb_deprecated('gimp-image-scale');
-    &neo_pdb_misc('2008', '2.6');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'new_width', type => '1 <= int32 <= GIMP_MAX_IMAGE_SIZE',
-          desc => 'New image width' },
-        { name => 'new_height', type => '1 <= int32 <= GIMP_MAX_IMAGE_SIZE',
-          desc => 'New image height' },
-        { name => 'interpolation', type => 'enum GimpInterpolationType',
-          desc => 'Type of interpolation' }
-    );
-
-    %invoke = (
-        headers => [ qw("core/gimpimage-scale.h") ],
-        code => <<'CODE'
-{
-  if (progress)
-    gimp_progress_start (progress, FALSE, _("Scaling"));
-
-  gimp_image_scale (image, new_width, new_height, interpolation, progress);
-
-  if (progress)
-    gimp_progress_end (progress);
-}
-CODE
-    );
-}
-
 sub image_crop {
     $blurb = 'Crop the image to the specified extents.';
 
@@ -263,7 +232,7 @@ CODE
               "gimp-intl.h");
 
 @procs = qw(image_resize image_resize_to_layers
-            image_scale image_scale_full
+            image_scale
             image_crop image_flip image_rotate);
 
 %exports = (app => [@procs], lib => [@procs]);
diff --git a/pdb/groups/layer.pdb b/pdb/groups/layer.pdb
index 83560ef..ae60417 100644
--- a/pdb/groups/layer.pdb
+++ b/pdb/groups/layer.pdb
@@ -486,49 +486,6 @@ CODE
     );
 }
 
-sub layer_scale_full {
-    &std_pdb_deprecated('gimp-layer-scale');
-    &neo_pdb_misc('2008', '2.6');
-
-    @inargs = (
-       { name => 'layer', type => 'layer',
-         desc => 'The layer' },
-       { name => 'new_width', type => '1 <= int32 <= GIMP_MAX_IMAGE_SIZE',
-         desc => 'New layer width' },
-       { name => 'new_height', type => '1 <= int32 <= GIMP_MAX_IMAGE_SIZE',
-         desc => 'New layer height' },
-       { name => 'local_origin', type => 'boolean',
-         desc => 'Use a local origin (as opposed to the image origin)' },
-       { name => 'interpolation', type => 'enum GimpInterpolationType',
-         desc => 'Type of interpolation' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL,
-                                 GIMP_PDB_ITEM_CONTENT | GIMP_PDB_ITEM_POSITION,
-                                 error))
-    {
-      if (progress)
-        gimp_progress_start (progress, FALSE, _("Scaling"));
-
-      gimp_item_scale_by_origin (GIMP_ITEM (layer), new_width, new_height,
-                                 interpolation, progress,
-                                 local_origin);
-
-      if (progress)
-        gimp_progress_end (progress);
-    }
-  else
-    {
-      success = FALSE;
-    }
-}
-CODE
-    );
-}
-
 sub layer_resize {
     $blurb = 'Resize the layer to the specified extents.';
 
@@ -600,52 +557,6 @@ CODE
     );
 }
 
-sub layer_translate {
-    $blurb = 'Translate the layer by the specified offsets.';
-
-    $help = <<'HELP';
-This procedure translates the layer by the amounts specified in the x and y
-arguments. These can be negative, and are considered offsets from the current
-position. This command only works if the layer has been added to an image. All
-additional layers contained in the image which have the linked flag set to TRUE
-w ill also be translated by the specified offsets.
-HELP
-
-    &std_pdb_misc;
-
-    $deprecated = 'gimp-item-transform-translate';
-
-    @inargs = (
-       { name => 'layer', type => 'layer',
-         desc => 'The layer' },
-       { name => 'offx', type => 'int32',
-         desc => "Offset in x direction" },
-       { name => 'offy', type => 'int32',
-         desc => "Offset in y direction" }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_modifiable (GIMP_ITEM (layer),
-                                   GIMP_PDB_ITEM_POSITION, error))
-    {
-      if (gimp_item_get_linked (GIMP_ITEM (layer)))
-        {
-          gimp_item_linked_translate (GIMP_ITEM (layer), offx, offy, TRUE);
-        }
-      else
-        {
-          gimp_item_translate (GIMP_ITEM (layer), offx, offy, TRUE);
-        }
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 sub layer_add_alpha {
     $blurb = <<'BLURB';
 Add an alpha channel to the layer if it doesn't already have one.
@@ -1380,9 +1291,8 @@ CODE
             layer_copy
             layer_add_alpha
             layer_flatten
-            layer_scale layer_scale_full
+            layer_scale
             layer_resize layer_resize_to_image_size
-           layer_translate
             layer_set_offsets
             layer_create_mask
             layer_get_mask
diff --git a/pdb/groups/palettes.pdb b/pdb/groups/palettes.pdb
index 6ba01eb..87ee0cc 100644
--- a/pdb/groups/palettes.pdb
+++ b/pdb/groups/palettes.pdb
@@ -68,82 +68,6 @@ CODE
     );
 }
 
-sub palettes_get_palette {
-    &std_pdb_deprecated ('gimp-context-get-palette');
-
-    @outargs = (
-       { name => 'name', type => 'string', null_ok => 1,
-         desc => 'The palette name' },
-       { name => 'num_colors', type => 'int32',
-         desc => 'The palette num_colors' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  GimpPalette *palette = gimp_context_get_palette (context);
-
-  if (palette)
-    {
-      name       = g_strdup (gimp_object_get_name (palette));
-      num_colors = gimp_palette_get_n_colors (palette);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub palettes_get_palette_entry {
-    &std_pdb_deprecated ('gimp-palette-entry-get-color');
-
-    @inargs = (
-       { name => 'name', type => 'string', null_ok => 1,
-         desc => 'The palette name ("" means currently active palette)' },
-        { name => 'entry_num', type => 'int32',
-          desc => 'The entry to retrieve' }
-    );
-
-    @outargs = (
-       { name => 'actual_name', type => 'string',
-         desc => 'The palette name' },
-       { name => 'num_colors', type => 'int32',
-         desc => 'The palette num_colors' },
-       { name => 'color', type => 'color', void_ret => 1,
-         desc => 'The color requested' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpPalette *palette;
-
-  if (name && strlen (name))
-    palette = gimp_pdb_get_palette (gimp, name, FALSE, error);
-  else
-    palette = gimp_context_get_palette (context);
-
-  if (palette)
-    {
-      GimpPaletteEntry *entry = gimp_palette_get_entry (palette, entry_num);
-
-      if (entry)
-        {
-          actual_name = g_strdup (gimp_object_get_name (palette));
-          num_colors  = gimp_palette_get_n_colors (palette);
-          color       = entry->color;
-        }
-      else
-        success = FALSE;
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 
 @headers = qw(<string.h>
               "core/gimp.h"
@@ -153,9 +77,7 @@ CODE
               "gimppdb-utils.h");
 
 @procs = qw(palettes_refresh
-            palettes_get_list
-            palettes_get_palette
-            palettes_get_palette_entry);
+            palettes_get_list);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/patterns.pdb b/pdb/groups/patterns.pdb
index 747f275..ffc1661 100644
--- a/pdb/groups/patterns.pdb
+++ b/pdb/groups/patterns.pdb
@@ -68,85 +68,6 @@ CODE
     );
 }
 
-sub patterns_get_pattern {
-    &std_pdb_deprecated ('gimp-context-get-pattern');
-
-    @outargs = (
-       { name => 'name', type => 'string',
-         desc => 'The pattern name' },
-       { name => 'width', type => 'int32',
-         desc => 'The pattern width' },
-       { name => 'height', type => 'int32',
-         desc => 'The pattern height' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpPattern *pattern = gimp_context_get_pattern (context);
-
-  if (pattern)
-    {
-      name   = g_strdup (gimp_object_get_name (pattern));
-      width  = gimp_temp_buf_get_width  (pattern->mask);
-      height = gimp_temp_buf_get_height (pattern->mask);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub patterns_get_pattern_data {
-    &std_pdb_deprecated ('gimp-pattern-get-pixels');
-
-    @inargs = (
-       { name => 'name', type => 'string', null_ok => 1,
-         desc => 'The pattern name ("" means currently active pattern)' }
-    );
-
-    @outargs = (
-       { name => 'actual_name', type => 'string',
-         desc => 'The pattern name' },
-       { name => 'width', type => 'int32',
-         desc => 'The pattern width' },
-       { name => 'height', type => 'int32',
-         desc => 'The pattern height' },
-       { name => 'mask_bpp', type => 'int32',
-         desc => 'Pattern bytes per pixel' },
-       { name => 'mask_data', type => 'int8array',
-         desc => 'The pattern mask data',
-         array => { name => 'length',
-                    desc => 'Length of pattern mask data' } }
-    );
-    
-    %invoke = (
-       code => <<'CODE'
-{
-  GimpPattern *pattern;
-
-  if (name && strlen (name))
-    pattern = gimp_pdb_get_pattern (gimp, name, error);
-  else
-    pattern = gimp_context_get_pattern (context);
-
-  if (pattern)
-    {
-      actual_name = g_strdup (gimp_object_get_name (pattern));
-      width       = gimp_temp_buf_get_width  (pattern->mask);
-      height      = gimp_temp_buf_get_height (pattern->mask);
-      mask_bpp    = babl_format_get_bytes_per_pixel (gimp_temp_buf_get_format (pattern->mask));
-      length      = gimp_temp_buf_get_data_size (pattern->mask);
-      mask_data   = g_memdup (gimp_temp_buf_get_data (pattern->mask), length);
-    }
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 
 @headers = qw(<string.h>
               "core/gimp.h"
@@ -157,9 +78,7 @@ CODE
               "gimppdb-utils.h");
 
 @procs = qw(patterns_refresh
-            patterns_get_list
-            patterns_get_pattern
-            patterns_get_pattern_data);
+            patterns_get_list);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/selection.pdb b/pdb/groups/selection.pdb
index 1d8e33f..ee757fe 100644
--- a/pdb/groups/selection.pdb
+++ b/pdb/groups/selection.pdb
@@ -454,74 +454,6 @@ CODE
     );
 }
 
-sub selection_layer_alpha {
-    &std_pdb_deprecated ('gimp-image-select-item');
-
-    @inargs = (
-       { name => 'layer', type => 'layer',
-         desc => 'Layer with alpha' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (layer), NULL, 0, error))
-    gimp_item_to_selection (GIMP_ITEM (layer),
-                            GIMP_CHANNEL_OP_REPLACE,
-                            TRUE, FALSE, 0.0, 0.0);
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub selection_load {
-    &std_pdb_deprecated ('gimp-image-select-item');
-
-    @inargs = (
-       { name => 'channel', type => 'channel',
-         desc => 'The channel' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), NULL, 0, error))
-    gimp_item_to_selection (GIMP_ITEM (channel),
-                            GIMP_CHANNEL_OP_REPLACE,
-                            TRUE, FALSE, 0.0, 0.0);
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub selection_combine {
-    &std_pdb_deprecated ('gimp-image-select-item');
-
-    @inargs = (
-       { name => 'channel', type => 'channel',
-         desc => 'The channel' },
-       { name => 'operation', type => 'enum GimpChannelOps',
-         desc => 'The selection operation' }
-    );
-
-    %invoke = (
-       code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (channel), NULL, 0, error))
-    gimp_item_to_selection (GIMP_ITEM (channel),
-                            operation,
-                            TRUE, FALSE, 0.0, 0.0);
-  else
-    success = FALSE;
-}
-CODE
-    );
-}
-
 sub selection_save {
     $blurb = 'Copy the selection mask to a new channel.';
 
@@ -574,8 +506,8 @@ CODE
            selection_translate selection_float
            selection_invert selection_sharpen selection_all selection_none
            selection_feather selection_border selection_grow selection_shrink
-           selection_flood selection_layer_alpha selection_load selection_save
-           selection_combine);
+           selection_flood
+           selection_save);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/text_layer.pdb b/pdb/groups/text_layer.pdb
index 1328ee0..4e262ae 100644
--- a/pdb/groups/text_layer.pdb
+++ b/pdb/groups/text_layer.pdb
@@ -346,80 +346,6 @@ CODE
     );
 }
 
-sub text_layer_get_hinting {
-    &std_pdb_deprecated ('gimp-text-layer-get-hint-style');
-
-    @inargs = (
-        { name => 'layer', type => 'layer',
-          desc => 'The text layer' }
-    );
-
-    @outargs = (
-        { name => 'hinting', type => 'boolean',
-          desc => 'A flag which is true if hinting is used on the font.' },
-        { name => 'autohint', type => 'boolean',
-          desc => 'A flag which is true if the text layer is forced to use the autohinter from FreeType.' }
-    );
-    
-    %invoke = (
-        code => <<'CODE'
-{
-  if (gimp_pdb_layer_is_text_layer (layer, 0, error))
-    {
-      g_object_get (gimp_text_layer_get_text (GIMP_TEXT_LAYER (layer)),
-                    "hinting", &hinting,
-                    NULL);
-    }
-  else
-    {
-      success = FALSE;
-    }
-}
-CODE
-    );
-}
-
-sub text_layer_set_hinting {
-    &std_pdb_deprecated ('gimp-text-layer-set-hint-style');
-
-    $blurb = 'Enable/disable the use of hinting in a text layer.';
-
-    $help = <<'HELP';
-This procedure enables or disables hinting on the text of a text
-layer. If you enable 'auto-hint', FreeType\'s automatic hinter will be
-used and hinting information from the font will be ignored.
-HELP
-
-    &marcus_pdb_misc('2008', '2.6');
-
-    @inargs = (
-        { name => 'layer', type => 'layer',
-          desc => 'The text layer' },
-        { name => 'hinting', type => 'boolean',
-          desc => 'Enable/disable the use of hinting on the text' },
-        { name => 'autohint', type => 'boolean', dead => 1,
-          desc => 'Force the use of the autohinter provided through FreeType' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  if (gimp_pdb_layer_is_text_layer (layer, GIMP_PDB_ITEM_CONTENT, error))
-    {
-      gimp_text_layer_set (GIMP_TEXT_LAYER (layer),
-                           _("Set text layer attribute"),
-                           "hinting", hinting,
-                           NULL);
-    }
-  else
-    {
-      success = FALSE;
-    }
-}
-CODE
-    );
-}
-
 sub text_layer_get_antialias {
     $blurb = 'Check if antialiasing is used in the text layer.';
 
@@ -1238,10 +1164,7 @@ CODE
             text_layer_set_line_spacing
             text_layer_get_letter_spacing
             text_layer_set_letter_spacing
-            text_layer_resize
-            text_layer_get_hinting
-            text_layer_set_hinting
-);
+            text_layer_resize);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/text_tool.pdb b/pdb/groups/text_tool.pdb
index f30ac1c..3b0c78c 100644
--- a/pdb/groups/text_tool.pdb
+++ b/pdb/groups/text_tool.pdb
@@ -146,137 +146,13 @@ CODE
     );
 }
 
-sub text {
-    &std_pdb_deprecated ('gimp-text-fontname');
-
-    @inargs = (
-        { name => 'image', type => 'image',
-          desc => 'The image' },
-        { name => 'drawable', type => 'drawable',
-          desc => 'The affected drawable: (-1 for a new text layer)',
-          none_ok => 1 },
-        { name => 'x', type => 'float',
-          desc => 'The x coordinate for the left of the text bounding box' },
-        { name => 'y', type => 'float',
-          desc => 'The y coordinate for the top of the text bounding box' },
-        { name => 'text', type => 'string',
-          desc => 'The text to generate (in UTF-8 encoding)' },
-        { name => 'border', type => '-1 <= int32',
-          desc => 'The size of the border' },
-        { name => 'antialias', type => 'boolean',
-          desc => 'Antialiasing' },
-        { name => 'size', type => '0 < float',
-          desc => 'The size of text in either pixels or points' },
-        { name => 'size_type', type => 'enum GimpSizeType', dead => 1,
-          desc => 'The units of specified size' },
-        { name => 'foundry', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font foundry' },
-        { name => 'family', type => 'string', allow_non_utf8 => 1,
-          desc => 'The font family' },
-        { name => 'weight', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font weight' },
-        { name => 'slant', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font slant' },
-        { name => 'set_width', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font set-width' },
-        { name => 'spacing', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font spacing' },
-        { name => 'registry', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font registry' },
-        { name => 'encoding', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font encoding' }
-    );
-
-    @outargs = (
-        { name => 'text_layer', type => 'layer',
-          desc => 'The new text layer or -1 if no layer was created.' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  if (drawable &&
-      (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), image,
-                                    GIMP_PDB_ITEM_CONTENT, error) ||
-       ! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error)))
-    success = FALSE;
-
-  if (success)
-    {
-      gchar *real_fontname = g_strdup_printf ("%s %d", family, (gint) size);
-
-      text_layer = text_render (image, drawable, context,
-                                x, y, real_fontname, text,
-                                border, antialias);
-
-      g_free (real_fontname);
-    }
-}
-CODE
-   );
-}
-
-sub text_get_extents {
-    &std_pdb_deprecated ('gimp-text-get-extents-fontname');
-
-    @inargs = (
-        { name => 'text', type => 'string',
-          desc => 'The text to generate (in UTF-8 encoding)' },
-        { name => 'size', type => '0 < float',
-          desc => 'The size of text in either pixels or points' },
-        { name => 'size_type', type => 'enum GimpSizeType', dead => 1,
-          desc => 'The units of specified size' },
-        { name => 'foundry', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font foundry' },
-        { name => 'family', type => 'string', allow_non_utf8 => 1,
-          desc => 'The font family' },
-        { name => 'weight', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font weight' },
-        { name => 'slant', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font slant' },
-        { name => 'set_width', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font set-width' },
-        { name => 'spacing', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font spacing' },
-        { name => 'registry', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font registry' },
-        { name => 'encoding', type => 'string', allow_non_utf8 => 1, dead => 1,
-          desc => 'The font encoding' }
-    );
-
-    @outargs = (
-        { name => 'width', type => 'int32', void_ret => 1,
-          desc => 'The width of the specified font' },
-        { name => 'height', type => 'int32',
-          desc => 'The height of the specified font' },
-        { name => 'ascent', type => 'int32',
-          desc => 'The ascent of the specified font' },
-        { name => 'descent', type => 'int32',
-          desc => 'The descent of the specified font' }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  gchar *real_fontname = g_strdup_printf ("%s %d", family, (gint) size);
-
-  success = text_get_extents (real_fontname, text,
-                              &width, &height,
-                              &ascent, &descent);
-
-  g_free (real_fontname);
-}
-CODE
-    );
-}
-
 
 @headers = qw("libgimpbase/gimpbase.h"
               "text/gimptext-compat.h"
               "gimppdb-utils.h");
 
-@procs = qw(text_fontname text_get_extents_fontname
-            text text_get_extents);
+@procs = qw(text_fontname
+            text_get_extents_fontname);
 
 %exports = (app => [@procs], lib => [@procs]);
 
diff --git a/pdb/groups/vectors.pdb b/pdb/groups/vectors.pdb
index b395e11..28fd053 100644
--- a/pdb/groups/vectors.pdb
+++ b/pdb/groups/vectors.pdb
@@ -1074,43 +1074,6 @@ CODE
     );
 }
 
-sub vectors_to_selection {
-    &std_pdb_deprecated ('gimp-image-select-item');
-    &simon_pdb_misc('2006', '2.4');
-
-    @inargs = (
-        { name => 'vectors', type => 'vectors',
-          desc => 'The vectors object to render to the selection' },
-        { name => 'operation', type => 'enum GimpChannelOps',
-          desc => 'The desired operation with current selection' },
-        { name => 'antialias', type => 'boolean',
-          desc => 'Antialias selection.' },
-        { name => 'feather', type => 'boolean',
-          desc => 'Feather selection.' },
-        { name => 'feather_radius_x', type => 'float',
-          desc => 'Feather radius x.'  },
-        { name => 'feather_radius_y', type => 'float',
-          desc => 'Feather radius y.'  }
-    );
-
-    %invoke = (
-        code => <<'CODE'
-{
-  if (gimp_pdb_item_is_attached (GIMP_ITEM (vectors), NULL, 0, error))
-    gimp_item_to_selection (GIMP_ITEM (vectors),
-                            operation,
-                            antialias,
-                            feather,
-                            feather_radius_x,
-                            feather_radius_y);
-  else
-    success = FALSE;
-}
-CODE
-    );
-
-}
-
 sub vectors_import_from_file {
     $blurb = 'Import paths from an SVG file.';
 
@@ -1349,7 +1312,6 @@ CODE
             vectors_bezier_stroke_conicto
             vectors_bezier_stroke_cubicto
             vectors_bezier_stroke_new_ellipse
-            vectors_to_selection
             vectors_import_from_file
             vectors_import_from_string
             vectors_export_to_file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 61a4ee7..0ca3de0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -334,11 +334,9 @@ app/paint/gimpsourceoptions.c
 app/paint/paint-enums.c
 
 app/pdb/channel-cmds.c
-app/pdb/color-cmds.c
 app/pdb/drawable-cmds.c
 app/pdb/drawable-color-cmds.c
 app/pdb/drawable-edit-cmds.c
-app/pdb/drawable-transform-cmds.c
 app/pdb/edit-cmds.c
 app/pdb/floating-sel-cmds.c
 app/pdb/gimppdb-query.c
@@ -355,13 +353,10 @@ app/pdb/image-transform-cmds.c
 app/pdb/image-undo-cmds.c
 app/pdb/item-transform-cmds.c
 app/pdb/layer-cmds.c
-app/pdb/paths-cmds.c
 app/pdb/plug-in-compat-cmds.c
 app/pdb/procedural-db-cmds.c
 app/pdb/selection-cmds.c
-app/pdb/selection-tools-cmds.c
 app/pdb/text-layer-cmds.c
-app/pdb/transform-tools-cmds.c
 app/pdb/vectors-cmds.c
 
 app/plug-in/gimpenvirontable.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]