Index: /tags/ipp-ops-20220906/Ohana/src/opihi/pclient/pclient.c.in
===================================================================
--- /tags/ipp-ops-20220906/Ohana/src/opihi/pclient/pclient.c.in	(revision 42950)
+++ /tags/ipp-ops-20220906/Ohana/src/opihi/pclient/pclient.c.in	(revision 42951)
@@ -76,8 +76,5 @@
   FreeBasic ();
   FreePclient ();
-  gprint (GP_LOG, "Goodbye\n"); // sent to pcontrol to signal exit
-
-  free_error (); // init_error() called in lib.shell/startup.c general_init()
-  gprintFree (); // gprintInit() called in lib.shell/startup.c general_init()
+  gprint (GP_LOG, "Goodbye\n");
 
   return;
Index: /tags/ipp-ops-20220906/Ohana/src/opihi/pcontrol/pcontrol.c.in
===================================================================
--- /tags/ipp-ops-20220906/Ohana/src/opihi/pcontrol/pcontrol.c.in	(revision 42950)
+++ /tags/ipp-ops-20220906/Ohana/src/opihi/pcontrol/pcontrol.c.in	(revision 42951)
@@ -9,8 +9,4 @@
 # define opihi_rcfile ".pcontrolrc"
 
-# ifdef THREADED  
-  static pthread_t clientsThread;
-# endif
-
 /* program-dependent initialization */
 void program_init (int *argc, char **argv) {
@@ -18,4 +14,8 @@
   OHANA_UNUSED_PARAM(argv);
   
+# ifdef THREADED  
+  pthread_t clientsThread;
+# endif
+
   auto_break = TRUE;
 
@@ -83,14 +83,8 @@
   SetRunLevel (PCONTROL_RUN_HOSTS); 
   DownHosts ();
+  ConfigFree ();
 
-  QuitCheckSystemThread();
-  pthread_join (clientsThread, NULL);
-
-  ConfigFree ();
   FreeBasic ();
   FreePcontrol ();
-
-  free_error (); // init_error() called in lib.shell/startup.c general_init()
-  gprintFree (); // gprintInit() called in lib.shell/startup.c general_init()
 
   return;