diff --git a/src/eva2/gui/OptimizationEditorPanel.java b/src/eva2/gui/OptimizationEditorPanel.java
index b2e462cd..1526518e 100644
--- a/src/eva2/gui/OptimizationEditorPanel.java
+++ b/src/eva2/gui/OptimizationEditorPanel.java
@@ -376,6 +376,8 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener {
     public void updateChildPropertySheet() {
         // Set the object as the target of the PropertySheet
         propertySheetPanel.setTarget(genericObjectEditor.getValue());
+        // Update the chooser
+        this.updateChooser();
     }
 
     /**
diff --git a/src/eva2/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java
index 9f64d562..02a29fcf 100644
--- a/src/eva2/gui/PropertySheetPanel.java
+++ b/src/eva2/gui/PropertySheetPanel.java
@@ -73,19 +73,11 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
      * A count of the number of properties we have an editor for.
      */
     private int numEditableProperties = 0;
-    /**
-     * How long should a tip text line be (translated to HTML).
-     */
-    private int tipTextLineLen = 50;
     /**
      * A support object for handling property change listeners.
      */
     private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
-    /**
-     * set true to use the GOE by default if no other editor is registered.
-     */
-    // If true, tool tips are used up to the first point only. 
-    boolean stripToolTipToFirstPoint = false;
+
     private ToolTipTable propertyTable;
     private DefaultTableModel propertyTableModel;
 
diff --git a/src/eva2/optimization/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java
index 081502ef..b43eb447 100644
--- a/src/eva2/optimization/strategies/HillClimbing.java
+++ b/src/eva2/optimization/strategies/HillClimbing.java
@@ -16,9 +16,6 @@ import eva2.util.annotation.Description;
  */
 @Description("The Hill Climber uses the default EA mutation and initializing operators. If the population size is bigger than one a multi-start Hill Climber is performed.")
 public class HillClimbing extends AbstractOptimizer implements java.io.Serializable {
-    // These variables are necessary for the simple testcase
-
-    private InterfaceOptimizationProblem optimizationProblem = new B1Problem();
     private InterfaceMutation mutator = null;
 
     public HillClimbing() {