Index: trunk/Ohana/src/opihi/pantasks/pantasks.c.in
===================================================================
--- trunk/Ohana/src/opihi/pantasks/pantasks.c.in	(revision 12842)
+++ trunk/Ohana/src/opihi/pantasks/pantasks.c.in	(revision 13479)
@@ -64,6 +64,5 @@
 /* add program-dependent exit functions here */
 void cleanup () {
-  QuitImage ();
-  QuitGraph ();
+  QuitKapa ();
   QuitController ();
   return;
Index: trunk/Ohana/src/opihi/pantasks/pantasks_client.c.in
===================================================================
--- trunk/Ohana/src/opihi/pantasks/pantasks_client.c.in	(revision 12842)
+++ trunk/Ohana/src/opihi/pantasks/pantasks_client.c.in	(revision 13479)
@@ -54,6 +54,5 @@
 /* add program-dependent exit functions here */
 void cleanup () {
-  QuitImage ();
-  QuitGraph ();
+  QuitKapa ();
   return;
 }
Index: trunk/Ohana/src/opihi/pantasks/pantasks_server.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/pantasks_server.c	(revision 12842)
+++ trunk/Ohana/src/opihi/pantasks/pantasks_server.c	(revision 13479)
@@ -74,7 +74,6 @@
 /* add program-dependent exit functions here */
 void cleanup () {
-  // QuitImage ();
-  // QuitGraph ();
-  // QuitController ();
+  QuitKapa ();
+  QuitController ();
   return;
 }