Index: generic/nsfAccessInt.h
===================================================================
diff -u -r884a4e033f0d9d93bf1e151dfe1be8cb074dad0f -rc209eaaec1fd3c37443ef858b0071be626bc1123
--- generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision 884a4e033f0d9d93bf1e151dfe1be8cb074dad0f)
+++ generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision c209eaaec1fd3c37443ef858b0071be626bc1123)
@@ -90,70 +90,6 @@
 # define Tcl_HashSize(tablePtr) ((tablePtr)->numEntries)
 #endif
 
-static NSF_INLINE NsfObject*NsfGetObjectFromCmdPtr(Tcl_Command cmd) nonnull(1);
-static NSF_INLINE NsfClass*NsfGetClassFromCmdPtr(Tcl_Command cmd) nonnull(1);
-static NSF_INLINE ClientData NsfGetClientDataFromCmdPtr(Tcl_Command cmd) nonnull(1);
-static NSF_INLINE Var *VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) nonnull(1) nonnull(2);
 
-static NSF_INLINE Var *
-VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) {
-  Var *varPtr = NULL;
-  Tcl_HashEntry *hPtr;
 
-  assert(tablePtr);
-  assert(key);
 
-  hPtr = Tcl_CreateHashEntry((Tcl_HashTable *) tablePtr,
-                             (char *) key, newPtr);
-  if (likely(hPtr != NULL)) {
-    varPtr = TclVarHashGetValue(hPtr);
-  }
-  return varPtr;
-}
-
-static NSF_INLINE TclVarHashTable *
-VarHashTableCreate() {
-  TclVarHashTable *varTablePtr = (TclVarHashTable *) ckalloc(sizeof(TclVarHashTable));
-  TclInitVarHashTable(varTablePtr, NULL);
-  return varTablePtr;
-}
-
-/*
- * Conversion from CmdPtr to Class / Object
- */
-
-static NSF_INLINE ClientData
-NsfGetClientDataFromCmdPtr(Tcl_Command cmd) {
-  assert(cmd);
-  /*fprintf(stderr, "objProc=%p %p\n", Tcl_Command_objProc(cmd),NsfObjDispatch);*/
-  if (likely(Tcl_Command_objProc(cmd) == NsfObjDispatch))
-    return Tcl_Command_objClientData(cmd);
-  else {
-    cmd = TclGetOriginalCommand(cmd);
-    if (likely(cmd != NULL) && unlikely(Tcl_Command_objProc(cmd) == NsfObjDispatch)) {
-      /*fprintf(stderr, "???? got cmd right in 2nd round\n");*/
-      return Tcl_Command_objClientData(cmd);
-    }
-    return NULL;
-  }
-}
-
-static NSF_INLINE NsfClass*
-NsfGetClassFromCmdPtr(Tcl_Command cmd) {
-  ClientData cd = NsfGetClientDataFromCmdPtr(cmd);
-  assert(cmd);
-  /*fprintf(stderr, "cd=%p\n",cd);*/
-  if (likely(cd != NULL)) {
-    return NsfObjectToClass(cd);
-  } else {
-    return NULL;
-  }
-}
-
-static NSF_INLINE NsfObject*
-NsfGetObjectFromCmdPtr(Tcl_Command cmd) {
-  assert(cmd);
-  return (NsfObject*) NsfGetClientDataFromCmdPtr(cmd);
-}
-
-