diff --git a/flutter-idea/src/io/flutter/pub/PubRootCache.java b/flutter-idea/src/io/flutter/pub/PubRootCache.java
index 99fcddab6..4d90bbdb2 100644
--- a/flutter-idea/src/io/flutter/pub/PubRootCache.java
+++ b/flutter-idea/src/io/flutter/pub/PubRootCache.java
@@ -7,7 +7,6 @@
 
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import io.flutter.utils.OpenApiUtils;
diff --git a/resources/META-INF/studio-contribs.xml b/resources/META-INF/studio-contribs.xml
index dad42b741..c89ab4350 100644
--- a/resources/META-INF/studio-contribs.xml
+++ b/resources/META-INF/studio-contribs.xml
@@ -14,14 +14,14 @@
     <postStartupActivity implementation="io.flutter.FlutterStudioStartupActivity"/>
     <projectOpenProcessor implementation="io.flutter.editor.FlutterStudioProjectOpenProcessor" order="after flutter"/>
     <library.type implementation="io.flutter.android.AndroidModuleLibraryType"/>
-    <projectService serviceInterface="io.flutter.android.AndroidModuleLibraryManager"
-                    serviceImplementation="io.flutter.android.AndroidModuleLibraryManager"/>
+    <projectService serviceImplementation="io.flutter.android.AndroidModuleLibraryManager"/>
 
   </extensions>
 
   <actions>
 
     <!-- Define the 'New Flutter Project' menu item -->
+    <!--suppress PluginXmlI18n -->
     <action id="flutter.NewProject" class="io.flutter.actions.FlutterNewProjectAction"
             text="New Flutter Project..."
             description="Create a new Flutter project">
@@ -29,6 +29,7 @@
     </action>
 
     <!-- The icon isn't being used here, but it is set by the action -->
+    <!--suppress PluginXmlI18n -->
     <action id="flutter.NewProject.welcome" class="io.flutter.actions.FlutterNewProjectAction"
             text="Create New Flutter Project"
             icon="FlutterIcons.Flutter"
diff --git a/resources/META-INF/studio-contribs_template.xml b/resources/META-INF/studio-contribs_template.xml
index 36645ef9f..36b4ab4cf 100644
--- a/resources/META-INF/studio-contribs_template.xml
+++ b/resources/META-INF/studio-contribs_template.xml
@@ -12,14 +12,14 @@
     <postStartupActivity implementation="io.flutter.FlutterStudioStartupActivity"/>
     <projectOpenProcessor implementation="io.flutter.editor.FlutterStudioProjectOpenProcessor" order="after flutter"/>
     <library.type implementation="io.flutter.android.AndroidModuleLibraryType"/>
-    <projectService serviceInterface="io.flutter.android.AndroidModuleLibraryManager"
-                    serviceImplementation="io.flutter.android.AndroidModuleLibraryManager"/>
+    <projectService serviceImplementation="io.flutter.android.AndroidModuleLibraryManager"/>
 
   </extensions>
 
   <actions>
 
     <!-- Define the 'New Flutter Project' menu item -->
+    <!--suppress PluginXmlI18n -->
     <action id="flutter.NewProject" class="io.flutter.actions.FlutterNewProjectAction"
             text="New Flutter Project..."
             description="Create a new Flutter project">
@@ -27,6 +27,7 @@
     </action>
 
     <!-- The icon isn't being used here, but it is set by the action -->
+    <!--suppress PluginXmlI18n -->
     <action id="flutter.NewProject.welcome" class="io.flutter.actions.FlutterNewProjectAction"
             text="Create New Flutter Project"
             icon="FlutterIcons.Flutter"