diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt
index 7ccaa6b56ef..fdaf1155431 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt
@@ -154,7 +154,7 @@ private class JetDeclarationRemotenessWeigher(private val file: JetFile) : Looku
             val importPath = ImportPath(qualifiedName)
             val fqName = importPath.fqnPart()
             return when {
-                JavaToKotlinClassMap.getInstance().mapPlatformClass(fqName).isNotEmpty() -> Weight.notToBeUsedInKotlin
+                JavaToKotlinClassMap.INSTANCE.mapPlatformClass(fqName).isNotEmpty() -> Weight.notToBeUsedInKotlin
                 ImportInsertHelper.getInstance().isImportedWithDefault(importPath, file) -> Weight.kotlinDefaultImport
                 importCache.isImportedWithPreciseImport(fqName) -> Weight.preciseImport
                 importCache.isImportedWithAllUnderImport(fqName) -> Weight.allUnderImport
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
index 222930cadc0..822b53a99d7 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
@@ -205,11 +205,11 @@ class SmartCompletion(val expression: JetSimpleNameExpression,
 
     // skip declarations of type Nothing or of generic parameter type which has no real bounds
     private fun shouldSkipDeclarationsOfType(type: FuzzyType): Boolean {
-        if (KotlinBuiltIns.getInstance().isNothing(type.type)) return true
+        if (KotlinBuiltIns.isNothing(type.type)) return true
         if (type.freeParameters.isEmpty()) return false
         val typeParameter = type.type.getConstructor().getDeclarationDescriptor() as? TypeParameterDescriptor ?: return false
         if (!type.freeParameters.contains(typeParameter)) return false
-        return KotlinBuiltIns.getInstance().isAnyOrNullableAny(typeParameter.getUpperBoundsAsType())
+        return KotlinBuiltIns.isAnyOrNullableAny(typeParameter.getUpperBoundsAsType())
         //TODO: check for class object constraint when there will be supported
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java
index 0b943e4f60d..da28b59a5b1 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java
@@ -117,7 +117,7 @@ public class ImportInsertHelperImpl extends ImportInsertHelper {
                                    ? TopDownAnalyzerFacadeForJS.DEFAULT_IMPORTS
                                    : TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS;
         if (importPath.fqnPart().asString().startsWith("java.lang.")
-            && !JavaToKotlinClassMap.getInstance().mapPlatformClass(importPath.fqnPart()).isEmpty()) {
+            && !JavaToKotlinClassMap.INSTANCE.mapPlatformClass(importPath.fqnPart()).isEmpty()) {
             return false;
         }
         return NamePackage.isImported(importPath, defaultImports);