diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java
index e9bc3b4..7bc8110 100644
--- a/plugins/EnergyScan.java
+++ b/plugins/EnergyScan.java
@@ -71,7 +71,8 @@ public class EnergyScan extends Panel {
     }
 
     void checkParameterControls() {
-        boolean enabled = isEnabled() && (comboRunType.getSelectedIndex() == 0);
+        boolean enabled;
+        enabled = isEnabled();
         for (Component c : panelParameters.getComponents()) {
             if (!(c instanceof JLabel)) {
                 c.setEnabled(enabled);
@@ -97,7 +98,6 @@ public class EnergyScan extends Panel {
         args.put("ROUNDS", (Integer) spinnerRounds.getValue());
         args.put("PLOT_TYPE", radioK1.isSelected() ? 1 : 2);
         args.put("SET_OFFSETS", jCheckBox1.isSelected() ? 1 : 2);
-        args.put("COMBO",comboRunType.getSelectedIndex());
         
         buttonAbort.setEnabled(true);
 
diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index 3f9d7f7..acc5d30 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -1,6 +1,5 @@
 import os
 import traceback
-print COMBO
 ############################PGM+ID1+ID2###################################################
 if str(SET_OFFSETS) == "1":
     print "Setting offsets"