diff --git a/.idea/libraries/guava_tools.xml b/.idea/libraries/guava_tools.xml
deleted file mode 100644
index b492cf4758e7..000000000000
--- a/.idea/libraries/guava_tools.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="guava-tools">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/guava-17.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/guava-17.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 75c853218d12..d1d98336339b 100644
--- a/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000-2016 JetBrains s.r.o.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");,
+ * 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
  *
@@ -123,9 +123,7 @@ class CommunityLibraryLicenses {
                    licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt"),
     libraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/"),
     libraryLicense(name: "Gson", version: "2.2.4", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/"),
-    libraryLicense(name: "Guava", libraryName: "guava-tools", version: "14.0.1", license: "Apache 2.0",
-                   url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html"),
-    libraryLicense(name: "Guava", version: "17.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
+    libraryLicense(name: "Guava", version: "19.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
                    licenseUrl: "http://ant.apache.org/license.html"),
     libraryLicense(name: "hamcrest", version: "1.3", license: "BSD", url: "http://hamcrest.org/",
                    licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"),
diff --git a/python/educational-core/course-creator/course-creator.iml b/python/educational-core/course-creator/course-creator.iml
index fed8cc4ab07d..6c6bf51f6d20 100644
--- a/python/educational-core/course-creator/course-creator.iml
+++ b/python/educational-core/course-creator/course-creator.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="library" name="guava-tools" level="project" />
     <orderEntry type="module" module-name="student" />
+    <orderEntry type="library" name="Guava" level="project" />
   </component>
 </module>
\ No newline at end of file