diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java
index 785c042b..25b29147 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java
@@ -191,30 +191,6 @@ public final class ScriptExecutor {
 
     private String[] replaceExpressions(String s) {
         s = s.replaceAll(" +", " ");
-        // TODO: Remove this code as the Expression System below will replace it!
-        Set<String> variables = new HashSet<>(localVariables.allVariables());
-        variables.addAll(Constants.allVariables());
-        variables.addAll(globalVariables.allVariables());
-
-        for (int i = 0; i < 3; i++) {
-            for (String variable : variables) {
-                s = s.replace("<" + variable + ">", getValue(variable));
-                s = s.replace("<" + variable + ".type>", getOrItselfValue(variable).type());
-            }
-            for (String constVariable : Constants.allVariables()) {
-                s = s.replace("<const." + constVariable + ">", getConstant(constVariable));
-                s = s.replace("<const." + constVariable + ".type>", Constants.getConstant(constVariable, player).type());
-            }
-            for (String localVariable : localVariables.allVariables()) {
-                s = s.replace("<local." + localVariable + ">", getLocal(localVariable));
-                s = s.replace("<local." + localVariable + ".type>", getLocalVariables().getValue(localVariable).type());
-            }
-            for (String globalVariable : globalVariables.allVariables()) {
-                s = s.replace("<global." + globalVariable + ">", getGlobal(globalVariable));
-                s = s.replace("<global." + globalVariable + ".type>", globalVariables.getValue(globalVariable).type());
-            }
-        }
-
         StringBuilder result = new StringBuilder();
         int depth = 0;
         StringBuilder st = new StringBuilder();