diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/flutter/FlutterUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/flutter/FlutterUtil.java
index 1508cbaca..cb0760bb6 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/flutter/FlutterUtil.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/flutter/FlutterUtil.java
@@ -99,8 +99,7 @@ protected void addImplicitResolvers() {
     });
 
     try {
-      //noinspection unchecked
-      return yaml.load(yamlContents);
+        return yaml.load(yamlContents);
     }
     catch (Exception e) {
       return null;
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
index 2ef2a61c0..acfaea999 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubActionBase.kt
@@ -60,7 +60,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jetbrains.annotations.Nls
 import org.jetbrains.annotations.NonNls
 import java.io.File
 import java.nio.file.Path
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/generation/CreateGetterSetterFix.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/generation/CreateGetterSetterFix.java
index a1213150b..1d37410a1 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/generation/CreateGetterSetterFix.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/generation/CreateGetterSetterFix.java
@@ -12,7 +12,6 @@
 import com.jetbrains.lang.dart.psi.DartReturnType;
 import com.jetbrains.lang.dart.psi.DartType;
 import com.jetbrains.lang.dart.util.DartPresentableUtil;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/call/DartCallHierarchyBrowser.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/call/DartCallHierarchyBrowser.java
index ffbfced7d..670a56d04 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/call/DartCallHierarchyBrowser.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/call/DartCallHierarchyBrowser.java
@@ -14,7 +14,6 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.PopupHandler;
 import com.jetbrains.lang.dart.ide.hierarchy.DartHierarchyUtil;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyBrowser.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyBrowser.java
index 72032d4e3..6cc9d25fe 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyBrowser.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/method/DartMethodHierarchyBrowser.java
@@ -14,7 +14,6 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.PopupHandler;
 import com.jetbrains.lang.dart.psi.*;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartTypeHierarchyBrowser.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartTypeHierarchyBrowser.java
index 4f760c84c..951721d0e 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartTypeHierarchyBrowser.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/hierarchy/type/DartTypeHierarchyBrowser.java
@@ -12,7 +12,6 @@
 import com.jetbrains.lang.dart.ide.hierarchy.DartHierarchyUtil;
 import com.jetbrains.lang.dart.psi.DartClass;
 import com.jetbrains.lang.dart.util.DartResolveUtil;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunnerParameters.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunnerParameters.java
index 5489a3ff9..255e02b9d 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunnerParameters.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunnerParameters.java
@@ -26,8 +26,7 @@ public class DartTestRunnerParameters extends DartCommandLineRunnerParameters im
 
   public void setScope(final Scope scope) {
     if (scope != null) { // null in case of corrupted storage
-      //noinspection deprecation
-      if (scope == Scope.GROUP || scope == Scope.METHOD) {
+        if (scope == Scope.GROUP || scope == Scope.METHOD) {
         myScope = Scope.GROUP_OR_TEST_BY_NAME;
       }
       else {
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/PubspecYamlUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/PubspecYamlUtil.java
index 223595f09..f81bdd21d 100644
--- a/third_party/src/main/java/com/jetbrains/lang/dart/util/PubspecYamlUtil.java
+++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/PubspecYamlUtil.java
@@ -173,8 +173,7 @@ protected void addImplicitResolvers() {
     });
 
     try {
-      //noinspection unchecked
-      return yaml.load(pubspecYamlFileContents);
+        return yaml.load(pubspecYamlFileContents);
     }
     catch (Exception e) {
       return null; // malformed yaml, e.g. because of typing in it