--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemTest.java	Tue Jan 07 12:22:47 2014 +0100
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TypeSystemTest.java	Tue Jan 07 18:52:32 2014 +0100
@@ -24,13 +24,12 @@
 
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.dsl.*;
-import com.oracle.truffle.api.dsl.test.NodeContainerTest.Str;
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.nodes.*;
 
 public class TypeSystemTest {
 
-    @TypeSystem({int.class, boolean.class, String.class, Str.class, CallTarget.class, BExtendsAbstract.class, CExtendsAbstract.class, Abstract.class, Object[].class})
+    @TypeSystem({int.class, boolean.class, String.class, CallTarget.class, BExtendsAbstract.class, CExtendsAbstract.class, Abstract.class, Object[].class})
     static class SimpleTypes {
 
         static int intCheck;
@@ -48,11 +47,6 @@
             return (int) value;
         }
 
-        @ImplicitCast
-        Str castStr(String strvalue) {
-            return new Str(strvalue);
-        }
-
     }
 
     @TypeSystemReference(SimpleTypes.class)
@@ -66,10 +60,6 @@
             return SimpleTypesGen.SIMPLETYPES.expectInteger(execute(frame));
         }
 
-        public Str executeStr(VirtualFrame frame) throws UnexpectedResultException {
-            return SimpleTypesGen.SIMPLETYPES.expectStr(execute(frame));
-        }
-
         public String executeString(VirtualFrame frame) throws UnexpectedResultException {
             return SimpleTypesGen.SIMPLETYPES.expectString(execute(frame));
         }