diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 6ac1e70177d..9d9f0fe34ac 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -44,14 +44,7 @@
               <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
               <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
               <element id="module-output" name="util.runtime" />
-              <element id="module-output" name="cli" />
-              <element id="module-output" name="descriptor.loader.java" />
-              <element id="module-output" name="frontend.java" />
-              <element id="module-output" name="serialization.java" />
-              <element id="module-output" name="descriptors" />
-              <element id="library" level="project" name="kotlin-runtime" />
             </element>
-            <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
           </element>
           <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
         </element>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 8d90433b36f..865c45a602f 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -168,7 +168,7 @@
 
     <fileTypeFactory implementation="org.jetbrains.jet.plugin.JetFileFactory"/>
 
-    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;jps/kotlin-runtime.jar"/>
+    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-plugin.jar"/>
 
     <lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetSyntaxHighlighterFactory"/>
     <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
diff --git a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
index 9d5c2310fb1..60868dbe1f8 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
@@ -36,11 +36,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import java.util.HashSet
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache
 import java.util.HashMap
-import com.google.common.collect.Maps
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import com.intellij.util.containers.MultiMap
 import com.intellij.openapi.util.io.FileUtil
-import com.google.common.hash.Hashing
+import java.security.MessageDigest
 
 val INLINE_ANNOTATION_DESC = "Lkotlin/inline;"
 
@@ -251,7 +250,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
 
         override fun read(`in`: DataInput): Map<String, Any>? {
             val size = `in`.readInt()
-            val map = Maps.newHashMapWithExpectedSize<String, Any>(size)!!
+            val map = HashMap<String, Any>(size)
 
             for (i in size.indices) {
                 val name = IOUtil.readString(`in`)!!
@@ -301,7 +300,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
                         override fun visitEnd() {
                             if (hasInlineAnnotation) {
                                 val dummyBytes = dummyClassWriter.toByteArray()!!
-                                val hash = Hashing.md5()!!.hashBytes(dummyBytes)!!.asLong()
+                                val hash = dummyBytes.md5()
 
                                 result[name + desc] = hash
                             }
@@ -343,7 +342,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
 
         override fun read(`in`: DataInput): Map<String, Long>? {
             val size = `in`.readInt()
-            val map = Maps.newHashMapWithExpectedSize<String, Long>(size)!!
+            val map = HashMap<String, Long>(size)
 
             for (i in size.indices) {
                 val name = IOUtil.readString(`in`)!!
@@ -438,6 +437,19 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache {
     }
 }
 
+private fun ByteArray.md5(): Long {
+    val d = MessageDigest.getInstance("MD5").digest(this)!!
+    return ((d[0].toLong() and 0xFFL)
+                    or ((d[1].toLong() and 0xFFL) shl 8)
+                    or ((d[2].toLong() and 0xFFL) shl 16)
+                    or ((d[3].toLong() and 0xFFL) shl 24)
+                    or ((d[4].toLong() and 0xFFL) shl 32)
+                    or ((d[5].toLong() and 0xFFL) shl 40)
+                    or ((d[6].toLong() and 0xFFL) shl 48)
+                    or ((d[7].toLong() and 0xFFL) shl 56)
+            )
+}
+
 private object ByteArrayExternalizer: DataExternalizer<ByteArray> {
     override fun save(out: DataOutput, value: ByteArray?) {
         out.writeInt(value!!.size)