diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java
index c4f00974c6ebe0400768b77c3bf1a42929ea6267..db586149532251cd403cd4b8d1975d56c725e622 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java
@@ -46,10 +46,6 @@ public class ActionClient<T_ACTION_GOAL extends Message,
     goalPublisher.publish(goal);
   }
 
-  void ActionClient(string actionName) {
-    this.actionName = actionName;
-  }
-  
   private void publishClient(ConnectedNode node) {
     goalPublisher = node.newPublisher(actionName + "/goal", actionGoalType);
     //clientCancel = connectedNode.newPublisher("fibonacci/cancel",
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java
index 919ce66a9125bfebe08e402ba03935559ba3abf7..2c7cb1692b7fc2617069b2c175cf036c2c1067fb 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java
@@ -37,25 +37,20 @@ public class TestClient extends AbstractNodeMain implements ActionClientListener
     goalMessage.setGoal(fibonacciGoal);
 
     while(repeat > 0) {
-      sleep(1000);
-    System.out.println("Sending goal #" + repeat + "...");
-    ac.sendGoal(goalMessage);
-    System.out.println("Goal sent.");
-    repeat--;
-    }
-
-    while (repeat > 0) {
       responded = false;
+      sleep(1000);
+      System.out.println("Sending goal #" + repeat + "...");
       ac.sendGoal(goalMessage);
-      while (!responded) {
-      }
+      System.out.println("Goal sent.");
+      while (!responded);
       repeat--;
     }
 
     System.out.println("Finishing node!!");
-    sleep(30000);
-    ac.finish();
-    node.shutdown();
+    //sleep(30000);
+    //ac.finish();
+    //node.shutdown();
+    System.exit(0);
   }
 
   @Override