diff --git a/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt b/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt
index 8075234c649..8195d0efec3 100644
--- a/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt
+++ b/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt
@@ -1,43 +1,43 @@
-package org.jetbrains.jet.j2k.actions
-
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import org.jetbrains.jet.j2k.Converter
-import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.actionSystem.LangDataKeys
-import com.intellij.psi.PsiJavaFile
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.fileEditor.FileDocumentManager
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.psi.codeStyle.CodeStyleManager
-
-class JavaToKotlinAction(): AnAction() {
-    public override fun actionPerformed(event : AnActionEvent?) {
-        val converter = Converter()
-        val psiFile = event!!.getData(LangDataKeys.PSI_FILE)!!
-        ApplicationManager.getApplication()?.runWriteAction(object : Runnable {
-            public override fun run() {
-                val result = converter.fileToFile(psiFile as PsiJavaFile).toKotlin()
-                val newName = FileUtil.getNameWithoutExtension(psiFile.getName()) + ".kt"
-                val newFile = psiFile.getContainingDirectory()?.createFile(newName)!!
-                val project = psiFile.getProject()
-                val psiDocumentManager = PsiDocumentManager.getInstance(project)!!
-                val document = psiDocumentManager.getDocument(newFile)!!
-                document.setText(result)
-                psiDocumentManager.doPostponedOperationsAndUnblockDocument(document)
-                psiDocumentManager.commitDocument(document)
-                CodeStyleManager.getInstance(project)!!.reformat(newFile)
-                psiFile.setName(psiFile.getName() + ".old")
-                newFile.navigate(true)
-            }
-        })
-    }
-
-
-    public override fun update(e : AnActionEvent?) {
-        val psiFile = e!!.getData(LangDataKeys.PSI_FILE)
-        e.getPresentation().setEnabled(psiFile is PsiJavaFile)
-    }
-}
+//package org.jetbrains.jet.j2k.actions
+//
+//import com.intellij.openapi.actionSystem.AnAction
+//import com.intellij.openapi.actionSystem.AnActionEvent
+//import org.jetbrains.jet.j2k.Converter
+//import com.intellij.openapi.actionSystem.PlatformDataKeys
+//import com.intellij.openapi.actionSystem.LangDataKeys
+//import com.intellij.psi.PsiJavaFile
+//import com.intellij.openapi.util.io.FileUtil
+//import com.intellij.openapi.fileEditor.FileDocumentManager
+//import com.intellij.psi.PsiDocumentManager
+//import com.intellij.openapi.command.WriteCommandAction
+//import com.intellij.openapi.application.ApplicationManager
+//import com.intellij.psi.codeStyle.CodeStyleManager
+//
+//class JavaToKotlinAction(): AnAction() {
+//    public override fun actionPerformed(event : AnActionEvent?) {
+//        val converter = Converter()
+//        val psiFile = event!!.getData(LangDataKeys.PSI_FILE)!!
+//        ApplicationManager.getApplication()?.runWriteAction(object : Runnable {
+//            public override fun run() {
+//                val result = converter.fileToFile(psiFile as PsiJavaFile).toKotlin()
+//                val newName = FileUtil.getNameWithoutExtension(psiFile.getName()) + ".kt"
+//                val newFile = psiFile.getContainingDirectory()?.createFile(newName)!!
+//                val project = psiFile.getProject()
+//                val psiDocumentManager = PsiDocumentManager.getInstance(project)!!
+//                val document = psiDocumentManager.getDocument(newFile)!!
+//                document.setText(result)
+//                psiDocumentManager.doPostponedOperationsAndUnblockDocument(document)
+//                psiDocumentManager.commitDocument(document)
+//                CodeStyleManager.getInstance(project)!!.reformat(newFile)
+//                psiFile.setName(psiFile.getName() + ".old")
+//                newFile.navigate(true)
+//            }
+//        })
+//    }
+//
+//
+//    public override fun update(e : AnActionEvent?) {
+//        val psiFile = e!!.getData(LangDataKeys.PSI_FILE)
+//        e.getPresentation().setEnabled(psiFile is PsiJavaFile)
+//    }
+//}
diff --git a/src/org/jetbrains/jet/j2k/ast/Class.kt b/src/org/jetbrains/jet/j2k/ast/Class.kt
index f6b043eebad..71d86819e0f 100644
--- a/src/org/jetbrains/jet/j2k/ast/Class.kt
+++ b/src/org/jetbrains/jet/j2k/ast/Class.kt
@@ -60,7 +60,7 @@ public open class Class(converter : Converter,
     private fun constructorToInit(f: Function): Function {
         val modifiers = HashSet<Modifier>(f.modifiers)
         modifiers.add(Modifier.STATIC)
-        val statements : List<Element> = f.block?.statements ?: arrayList()
+        val statements = ArrayList<Element>(f.block?.statements ?: listOf())
         statements.add(ReturnStatement(Identifier("__")))
         val block = Block(statements)
         val constructorTypeParameters = ArrayList<Element>()
@@ -81,7 +81,7 @@ public open class Class(converter : Converter,
     }
 
     open fun implementTypesToKotlin() : String {
-        val allTypes : List<String> = arrayList()
+        val allTypes  = ArrayList<String>()
         allTypes.addAll(baseClassSignatureWithParams())
         allTypes.addAll(implementsTypes.map { it.toKotlin() })
         return if (allTypes.size() == 0)
@@ -91,7 +91,7 @@ public open class Class(converter : Converter,
     }
 
     open fun modifiersToKotlin() : String {
-        val modifierList : List<Modifier> = arrayList()
+        val modifierList  = ArrayList<Modifier>()
         val modifier = accessModifier()
         if (modifier != null) {
             modifierList.add(modifier)
@@ -115,7 +115,7 @@ public open class Class(converter : Converter,
     }
 
     private fun classObjectToKotlin() : String {
-        val staticMembers : List<Node> = arrayList()
+        val staticMembers = ArrayList<Node>()
         staticMembers.addAll(secondaryConstructorsAsStaticInitFunction())
         staticMembers.addAll(getStatic(membersExceptConstructors()))
         return staticMembers.toKotlin("\n", "class object {\n", "\n}")
diff --git a/src/org/jetbrains/jet/j2k/ast/Field.kt b/src/org/jetbrains/jet/j2k/ast/Field.kt
index 37ab13a6d90..1d81c890646 100644
--- a/src/org/jetbrains/jet/j2k/ast/Field.kt
+++ b/src/org/jetbrains/jet/j2k/ast/Field.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jet.j2k.ast
 import org.jetbrains.jet.j2k.ast.types.Type
 import java.util.LinkedList
 import org.jetbrains.jet.j2k.Converter
+import java.util.ArrayList
 
 public open class Field(val identifier : Identifier,
                         val docComments: List<Node>,
@@ -12,7 +13,7 @@ public open class Field(val identifier : Identifier,
                         val writingAccesses : Int) : Member(modifiers) {
 
     open fun modifiersToKotlin() : String {
-        val modifierList : List<Modifier> = arrayList()
+        val modifierList = ArrayList<Modifier>()
         if (isAbstract()) {
             modifierList.add(Modifier.ABSTRACT)
         }
diff --git a/src/org/jetbrains/jet/j2k/ast/Function.kt b/src/org/jetbrains/jet/j2k/ast/Function.kt
index 73ae61adeeb..1f0f4ca9642 100644
--- a/src/org/jetbrains/jet/j2k/ast/Function.kt
+++ b/src/org/jetbrains/jet/j2k/ast/Function.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jet.j2k.ast
 
 import java.util.LinkedList
 import org.jetbrains.jet.j2k.ast.types.Type
+import java.util.ArrayList
 
 public open class Function(val name : Identifier,
                            val docComments: List<Node>,
@@ -30,7 +31,7 @@ public open class Function(val name : Identifier,
     }
 
     open fun modifiersToKotlin() : String {
-        val modifierList: List<Modifier> = arrayList()
+        val modifierList = ArrayList<Modifier>()
         val accessModifier = accessModifier()
         if (accessModifier != null) {
             modifierList.add(accessModifier)
diff --git a/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java b/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java
index 155ed96f7bc..af6a54de9cb 100644
--- a/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java
+++ b/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.j2k;
 
-import com.intellij.core.JavaCoreEnvironment;
+import com.intellij.core.JavaCoreProjectEnvironment;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiFile;
@@ -38,7 +38,7 @@ public class StandaloneJavaToKotlinConverterTest extends TestCase {
     private final String myDataPath;
     private final String myName;
     @NotNull
-    private final static JavaCoreEnvironment myJavaCoreEnvironment = JavaToKotlinTranslator.setUpJavaCoreEnvironment();
+    private final static JavaCoreProjectEnvironment myJavaCoreEnvironment = JavaToKotlinTranslator.setUpJavaCoreEnvironment();
 
     public StandaloneJavaToKotlinConverterTest(String dataPath, String name) {
         myDataPath = dataPath;