diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
index 49f72fc12c8..a21e41301f9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiFactory.java
@@ -334,7 +334,7 @@ public class JetPsiFactory {
 
     @NotNull
     public static JetTypeCodeFragment createTypeCodeFragment(Project project, String text, PsiElement context) {
-        return new JetTypeCodeFragmentImpl(project, "fragment.kt", text, context);
+        return new JetTypeCodeFragment(project, "fragment.kt", text, context);
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java
index ab01531002b..3a6d2a4742b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragment.java
@@ -16,11 +16,42 @@
 
 package org.jetbrains.jet.lang.psi;
 
-import com.intellij.psi.PsiCodeFragment;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.types.JetType;
+import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.jet.lexer.JetTokens;
+
+public class JetTypeCodeFragment extends JetCodeFragment {
+    public JetTypeCodeFragment(Project project, String name, CharSequence text, PsiElement context) {
+        super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context);
+    }
 
-public interface JetTypeCodeFragment extends PsiCodeFragment {
     @Nullable
-    JetType getType();
+    public JetType getType() {
+        JetType type = null;
+
+        for (PsiElement child : getChildren()) {
+            IElementType elementType = child.getNode().getElementType();
+
+            if (elementType == JetNodeTypes.TYPE_CODE_FRAGMENT) {
+                for (PsiElement grChild : child.getChildren()) {
+                    if (grChild instanceof JetTypeReference) {
+                        if (!grChild.getText().isEmpty())
+                            //TODO return the actual type
+                            type = KotlinBuiltIns.getInstance().getAnyType();
+                    }
+                    else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
+                        return null;
+                }
+            }
+            else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
+                return null;
+        }
+
+        return type;
+    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java
deleted file mode 100644
index 4761f211c83..00000000000
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeCodeFragmentImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.psi;
-
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.JetNodeTypes;
-import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.lexer.JetTokens;
-
-public class JetTypeCodeFragmentImpl extends JetCodeFragment implements JetTypeCodeFragment {
-    public JetTypeCodeFragmentImpl(Project project, String name, CharSequence text, PsiElement context) {
-        super(project, name, text, JetNodeTypes.TYPE_CODE_FRAGMENT, context);
-    }
-
-    @Nullable
-    @Override
-    public JetType getType() {
-        JetType type = null;
-
-        for (PsiElement child : getChildren()) {
-            IElementType elementType = child.getNode().getElementType();
-
-            if (elementType == JetNodeTypes.TYPE_CODE_FRAGMENT) {
-                for (PsiElement grChild : child.getChildren()) {
-                    if (grChild instanceof JetTypeReference) {
-                        if (!grChild.getText().isEmpty())
-                            //TODO return the actual type
-                            type = KotlinBuiltIns.getInstance().getAnyType();
-                    }
-                    else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
-                        return null;
-                }
-            }
-            else if (!JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(elementType))
-                return null;
-        }
-
-        return type;
-    }
-}