diff --git a/ChangeLog b/ChangeLog
index 0c6d9e8bf7..f89b08d713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-10  Michael Natterer  <mitch@gimp.org>
+
+	* app/core/gimpcontainer.c: disabled debuggind output.
+
+	* app/core/gimpdrawable.c (gimp_drawable_init): no need to
+	initialize variables twice :)
+
+	* app/widgets/gimpnavigationpreview.c: removed debugging output.
+
 2002-05-08  Nathan Summers  <rock@gimp.org>
 
 	* Changelog: (2002-05-06) somehow the Changelog entry for my dbbrower
diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c
index 258d7bb4f4..e18d8d9296 100644
--- a/app/core/gimpcontainer.c
+++ b/app/core/gimpcontainer.c
@@ -31,6 +31,15 @@
 #include "gimpmarshal.h"
 
 
+/* #define DEBUG_CONTAINER */
+
+#ifdef DEBUG_CONTAINER
+#define DEBUG(...) g_print(...)
+#else
+#define DEBUG(...)
+#endif
+
+
 typedef struct _GimpContainerHandler
 {
   gchar     *signame;
@@ -672,7 +681,7 @@ gimp_container_add_handler (GimpContainer *container,
   handler->callback_data = callback_data;
   handler->quark         = g_quark_from_string (key);
 
-  g_print ("%s: key = %s, id = %d\n", G_GNUC_FUNCTION, key, handler->quark);
+  DEBUG ("%s: key = %s, id = %d\n", G_GNUC_FUNCTION, key, handler->quark);
 
   g_free (key);
 
@@ -728,7 +737,7 @@ gimp_container_remove_handler (GimpContainer *container,
       return;
     }
 
-  g_print ("%s: id = %d\n", G_GNUC_FUNCTION, handler->quark);
+  DEBUG ("%s: id = %d\n", G_GNUC_FUNCTION, handler->quark);
 
   gimp_container_foreach (container,
 			  (GFunc) gimp_container_remove_handler_foreach_func,
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 22f7dd709c..280d4155b0 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -155,8 +155,6 @@ gimp_drawable_init (GimpDrawable *drawable)
   drawable->has_alpha     = FALSE;
   drawable->preview_cache = NULL;
   drawable->preview_valid = FALSE;
-  drawable->preview_cache = NULL;
-  drawable->preview_valid = FALSE;
 }
 
 static void
diff --git a/app/widgets/gimpnavigationpreview.c b/app/widgets/gimpnavigationpreview.c
index 6715d13fc9..673844b18d 100644
--- a/app/widgets/gimpnavigationpreview.c
+++ b/app/widgets/gimpnavigationpreview.c
@@ -389,8 +389,6 @@ gimp_navigation_preview_scroll (GtkWidget      *widget,
 
   nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
 
-  g_print ("gimp_navigation_preview_scroll(%d)\n", sevent->direction);
-
   if (sevent->state & GDK_SHIFT_MASK)
     {
       if (sevent->direction == GDK_SCROLL_UP)
diff --git a/app/widgets/gimpnavigationview.c b/app/widgets/gimpnavigationview.c
index 6715d13fc9..673844b18d 100644
--- a/app/widgets/gimpnavigationview.c
+++ b/app/widgets/gimpnavigationview.c
@@ -389,8 +389,6 @@ gimp_navigation_preview_scroll (GtkWidget      *widget,
 
   nav_preview = GIMP_NAVIGATION_PREVIEW (widget);
 
-  g_print ("gimp_navigation_preview_scroll(%d)\n", sevent->direction);
-
   if (sevent->state & GDK_SHIFT_MASK)
     {
       if (sevent->direction == GDK_SCROLL_UP)