Index: generic/nsf.c
===================================================================
diff -u -r7f016c41be93886f1f8956afeec49f99c5b3a708 -r4b207001b05300e9c4bbe28da106abadfb7ca1fc
--- generic/nsf.c	(.../nsf.c)	(revision 7f016c41be93886f1f8956afeec49f99c5b3a708)
+++ generic/nsf.c	(.../nsf.c)	(revision 4b207001b05300e9c4bbe28da106abadfb7ca1fc)
@@ -24975,34 +24975,6 @@
     }
     break;
 
-  case ConfigureoptionProfileIdx:
-    Tcl_SetBooleanObj(Tcl_GetObjResult(interp),
-                      (RUNTIME_STATE(interp)->doProfile));
-    if (valueObj != NULL) {
-#if defined(NSF_PROFILE)
-      RUNTIME_STATE(interp)->doProfile = boolVal;
-#else
-      NsfLog(interp, NSF_LOG_WARN, "No profile support compiled in");
-#endif
-    }
-    break;
-
-  case ConfigureoptionTraceIdx:
-    Tcl_SetBooleanObj(Tcl_GetObjResult(interp),
-                      (RUNTIME_STATE(interp)->doTrace));
-    if (valueObj != NULL) {
-#if defined(NSF_PROFILE)
-      RUNTIME_STATE(interp)->doTrace = boolVal;
-      /*
-       * Turn automically profiling on&off, when trace is turned on/off
-       */
-      RUNTIME_STATE(interp)->doProfile = boolVal;
-#else
-      NsfLog(interp, NSF_LOG_WARN, "No profile support compiled in");
-#endif
-    }
-    break;
-
   case ConfigureoptionSoftrecreateIdx:
     Tcl_SetBooleanObj(Tcl_GetObjResult(interp),
                       (RUNTIME_STATE(interp)->doSoftrecreate));
Index: generic/nsfAPI.decls
===================================================================
diff -u -r8465a13d65cb106deebded93f7fd4956dcb5f84a -r4b207001b05300e9c4bbe28da106abadfb7ca1fc
--- generic/nsfAPI.decls	(.../nsfAPI.decls)	(revision 8465a13d65cb106deebded93f7fd4956dcb5f84a)
+++ generic/nsfAPI.decls	(.../nsfAPI.decls)	(revision 4b207001b05300e9c4bbe28da106abadfb7ca1fc)
@@ -77,7 +77,7 @@
 }
 
 cmd configure NsfConfigureCmd {
-  {-argName "option" -required 1 -typeName "configureoption" -type "debug|dtrace|filter|profile|trace|softrecreate|objectsystems|keepcmds|checkresults|checkarguments"}
+  {-argName "option" -required 1 -typeName "configureoption" -type "debug|dtrace|filter|softrecreate|objectsystems|keepcmds|checkresults|checkarguments"}
   {-argName "value" -required 0 -type tclobj}
 } {-nxdoc 1}
 cmd colon NsfColonCmd {
Index: generic/nsfAPI.h
===================================================================
diff -u -r8465a13d65cb106deebded93f7fd4956dcb5f84a -r4b207001b05300e9c4bbe28da106abadfb7ca1fc
--- generic/nsfAPI.h	(.../nsfAPI.h)	(revision 8465a13d65cb106deebded93f7fd4956dcb5f84a)
+++ generic/nsfAPI.h	(.../nsfAPI.h)	(revision 4b207001b05300e9c4bbe28da106abadfb7ca1fc)
@@ -129,12 +129,12 @@
   return result;
 }
   
-typedef enum {ConfigureoptionNULL, ConfigureoptionDebugIdx, ConfigureoptionDtraceIdx, ConfigureoptionFilterIdx, ConfigureoptionProfileIdx, ConfigureoptionTraceIdx, ConfigureoptionSoftrecreateIdx, ConfigureoptionObjectsystemsIdx, ConfigureoptionKeepcmdsIdx, ConfigureoptionCheckresultsIdx, ConfigureoptionCheckargumentsIdx} ConfigureoptionIdx_t;
+typedef enum {ConfigureoptionNULL, ConfigureoptionDebugIdx, ConfigureoptionDtraceIdx, ConfigureoptionFilterIdx, ConfigureoptionSoftrecreateIdx, ConfigureoptionObjectsystemsIdx, ConfigureoptionKeepcmdsIdx, ConfigureoptionCheckresultsIdx, ConfigureoptionCheckargumentsIdx} ConfigureoptionIdx_t;
 
 static int ConvertToConfigureoption(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param const *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
-  static const char *opts[] = {"debug", "dtrace", "filter", "profile", "trace", "softrecreate", "objectsystems", "keepcmds", "checkresults", "checkarguments", NULL};
+  static const char *opts[] = {"debug", "dtrace", "filter", "softrecreate", "objectsystems", "keepcmds", "checkresults", "checkarguments", NULL};
   (void)pPtr;
   result = Tcl_GetIndexFromObj(interp, objPtr, opts, "configureoption", 0, &index);
   *clientData = (ClientData) INT2PTR(index + 1);
@@ -270,7 +270,7 @@
   {ConvertToRelationtype, "object-mixin|class-mixin|object-filter|class-filter|class|superclass|rootclass"},
   {ConvertToDefinitionsource, "all|application|system"},
   {ConvertToForwardproperty, "prefix|target|verbose"},
-  {ConvertToConfigureoption, "debug|dtrace|filter|profile|trace|softrecreate|objectsystems|keepcmds|checkresults|checkarguments"},
+  {ConvertToConfigureoption, "debug|dtrace|filter|softrecreate|objectsystems|keepcmds|checkresults|checkarguments"},
   {ConvertToObjectproperty, "initialized|class|rootmetaclass|rootclass|volatile|slotcontainer|hasperobjectslots|keepcallerself|perobjectdispatch"},
   {ConvertToAssertionsubcmd, "check|object-invar|class-invar"},
   {ConvertToParametersubcmd, "default|list|name|syntax|type"},