Index: trunk/Ohana/src/opihi/pcontrol/kill.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/kill.c	(revision 3189)
+++ trunk/Ohana/src/opihi/pcontrol/kill.c	(revision 4450)
@@ -1,5 +1,5 @@
 # include "pcontrol.h"
 
-int kill (int argc, char **argv) {
+int kill_pc (int argc, char **argv) {
 
   Job *job;
@@ -12,46 +12,10 @@
   JobID = atoi (argv[1]);
 
-  N = FindJob (JobID, PCONTROL_JOB_BUSY);
-  if (N < 0) {
+  job = PullJob (JobID, PCONTROL_JOB_BUSY);
+  if (job == NULL) {
     fprintf (stderr, "job %s not BUSY\n", argv[1]);
     return (FALSE);
   }
-  job = GetJob (PCONTROL_JOB_BUSY, N);
   KillJob (job);
   return (TRUE);
 }
-
-int delete (int argc, char **argv) {
-
-  Job *job;
-  int JobID, N;
-
-  if (argc < 2) {
-    fprintf (stderr, "USAGE: delete (JobID)\n");
-    return (FALSE);
-  }
-  JobID = atoi (argv[1]);
-  /* use a string interp to convert JobIDs to ints ? */
-
-  N = FindJob (JobID, PCONTROL_JOB_PENDING);
-  if (N >= 0) {
-    job = GetJob (PCONTROL_JOB_PENDING, N);
-    DelJob (job);
-    return (TRUE);
-  }
-  N = FindJob (JobID, PCONTROL_JOB_CRASH);
-  if (N >= 0) {
-    job = GetJob (PCONTROL_JOB_CRASH, N);
-    DelJob (job);
-    return (TRUE);
-  }
-  N = FindJob (JobID, PCONTROL_JOB_EXIT);
-  if (N >= 0) {
-    job = GetJob (PCONTROL_JOB_EXIT, N);
-    DelJob (job);
-    return (TRUE);
-  }
-
-  fprintf (stderr, "job %s not PENDING, CRASH, EXIT\n", argv[1]);
-  return (FALSE);
-}