Index: TODO
===================================================================
diff -u -r6032993b17135284877122cb24dbb65164252934 -rb69745e3ecfe9e95e9a48ce240c9837117050e6c
--- TODO	(.../TODO)	(revision 6032993b17135284877122cb24dbb65164252934)
+++ TODO	(.../TODO)	(revision b69745e3ecfe9e95e9a48ce240c9837117050e6c)
@@ -1820,9 +1820,9 @@
 - extended regression tests for aliases to procs
 - renamed nx regression tests .test to follow tcl conventions
 - added regression tests for destroy-during-init
+- remved debugging from NsfCleanupObject when compiled without DEVELOPMENT
 
 TODO: 
-- handling of msg in NsfCleanupObject
 - handling of msg in CscFinish
 
 - "-returns" 
Index: generic/nsf.c
===================================================================
diff -u -rb9a25a66a1e81fe208cac08f93c12b23eacc6ecd -rb69745e3ecfe9e95e9a48ce240c9837117050e6c
--- generic/nsf.c	(.../nsf.c)	(revision b9a25a66a1e81fe208cac08f93c12b23eacc6ecd)
+++ generic/nsf.c	(.../nsf.c)	(revision b69745e3ecfe9e95e9a48ce240c9837117050e6c)
@@ -209,7 +209,7 @@
 static void PrimitiveCDestroy(ClientData clientData);
 static void PrimitiveODestroy(ClientData clientData);
 static void PrimitiveDestroy(ClientData clientData);
-static void NsfCleanupObject(NsfObject *object, char *string);
+static void NsfCleanupObject_(NsfObject *object);
 
 /* prototypes for object and command lookup */
 static NsfObject *GetObjectFromString(Tcl_Interp *interp, CONST char *name);
@@ -548,11 +548,10 @@
   return nsPtr ? nsPtr->fullName : "";
 }
 
-// TODO: remove string
 static void
-NsfCleanupObject(NsfObject *object, char *string) {
+NsfCleanupObject_(NsfObject *object) {
   NsfObjectRefCountDecr(object);
-  /* fprintf(stderr, "obj refCount of %p after decr %d (%s)\n",object,object->refCount, string);*/
+  /* fprintf(stderr, "obj refCount of %p after decr %d\n",object,object->refCount);*/
 
   if (object->refCount <= 0) {
     /*fprintf(stderr, "NsfCleanupObject %p refcount %d\n", object, object->refCount);*/
Index: generic/nsf.h
===================================================================
diff -u -rd884e8166428ad9dae6c39cb16c8324953b69b11 -rb69745e3ecfe9e95e9a48ce240c9837117050e6c
--- generic/nsf.h	(.../nsf.h)	(revision d884e8166428ad9dae6c39cb16c8324953b69b11)
+++ generic/nsf.h	(.../nsf.h)	(revision b69745e3ecfe9e95e9a48ce240c9837117050e6c)
@@ -130,8 +130,13 @@
 
 #ifdef NSF_DEVELOPMENT
 # define CHECK_ACTIVATION_COUNTS 1
+# define NsfCleanupObject(object,string)				\
+  /*fprintf(stderr, "NsfCleanupObject %p %s\n",object,string);*/	\
+  NsfCleanupObject_(object);
 #else
 # define NDEBUG 1
+# define NsfCleanupObject(object,string)	\
+  NsfCleanupObject_(object);
 #endif