diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
index 754e1f3bbe49..931120bb599e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
@@ -248,7 +248,7 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
   }
 
   private static final Pair<Set<String>, Set<TextWithImports>> EMPTY_USED_VARS =
-    Pair.create(Collections.emptySet(), Collections.<TextWithImports>emptySet());
+    Pair.create(Collections.emptySet(), Collections.emptySet());
 
   // copied from FrameVariablesTree
   private void buildVariables(DebuggerContextImpl debuggerContext,
@@ -586,7 +586,7 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
   private static Pair<Set<String>, Set<TextWithImports>> findReferencedVars(Set<String> visibleVars, @NotNull SourcePosition position) {
     final int line = position.getLine();
     if (line < 0) {
-      return Pair.create(Collections.emptySet(), Collections.<TextWithImports>emptySet());
+      return Pair.create(Collections.emptySet(), Collections.emptySet());
     }
     final PsiFile positionFile = position.getFile();
     if (!positionFile.isValid() || !positionFile.getLanguage().isKindOf(JavaLanguage.INSTANCE)) {
@@ -596,7 +596,7 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
     final VirtualFile vFile = positionFile.getVirtualFile();
     final Document doc = vFile != null ? FileDocumentManager.getInstance().getDocument(vFile) : null;
     if (doc == null || doc.getLineCount() == 0 || line > (doc.getLineCount() - 1)) {
-      return Pair.create(Collections.emptySet(), Collections.<TextWithImports>emptySet());
+      return Pair.create(Collections.emptySet(), Collections.emptySet());
     }
 
     final TextRange limit = calculateLimitRange(positionFile, doc, line);
@@ -647,7 +647,7 @@ public class JavaStackFrame extends XStackFrame implements JVMStackFrameInfoProv
         }
       }
     }
-    return Pair.create(Collections.emptySet(), Collections.<TextWithImports>emptySet());
+    return Pair.create(Collections.emptySet(), Collections.emptySet());
   }
 
   private static TextRange calculateLimitRange(final PsiFile file, final Document doc, final int line) {
diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java b/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java
index 3943e0639a76..415673ac2af4 100644
--- a/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java
+++ b/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java
@@ -52,7 +52,7 @@ public class JavadocHelper {
   private static final String PARAM_TEXT = "param";
   
   private static final Pair<JavadocParameterInfo, List<JavadocParameterInfo>> EMPTY
-    = new Pair<>(null, Collections.<JavadocParameterInfo>emptyList());
+    = new Pair<>(null, Collections.emptyList());
   private static final JavadocHelper INSTANCE = new JavadocHelper();
   
   @NotNull
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JpsBuilderArtifactServiceImpl.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JpsBuilderArtifactServiceImpl.java
index 466035c93910..8cf5e0e15d4d 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JpsBuilderArtifactServiceImpl.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JpsBuilderArtifactServiceImpl.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author nik
  */
 public class JpsBuilderArtifactServiceImpl extends JpsBuilderArtifactService {
-  private static final JpsElementCollectionRole<JpsArtifact> SYNTHETIC_ARTIFACTS = JpsElementCollectionRole.create(JpsElementChildRoleBase.<JpsArtifact>create("synthetic artifact"));
+  private static final JpsElementCollectionRole<JpsArtifact> SYNTHETIC_ARTIFACTS = JpsElementCollectionRole.create(JpsElementChildRoleBase.create("synthetic artifact"));
 
   @Override
   public Collection<JpsArtifact> getArtifacts(JpsModel model, boolean includeSynthetic) {
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsCompositePackagingElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsCompositePackagingElementBase.java
index cf43d5ef764f..71041f3db8f7 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsCompositePackagingElementBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/elements/JpsCompositePackagingElementBase.java
@@ -29,7 +29,7 @@ import java.util.List;
  */
 public abstract class JpsCompositePackagingElementBase<Self extends JpsCompositePackagingElementBase<Self>> extends JpsCompositeElementBase<Self>
   implements JpsCompositePackagingElement {
-  private static final JpsElementCollectionRole<JpsPackagingElement> CHILDREN_ROLE = JpsElementCollectionRole.create(JpsElementChildRoleBase.<JpsPackagingElement>create("child"));
+  private static final JpsElementCollectionRole<JpsPackagingElement> CHILDREN_ROLE = JpsElementCollectionRole.create(JpsElementChildRoleBase.create("child"));
 
   protected JpsCompositePackagingElementBase() {
     myContainer.setChild(CHILDREN_ROLE);
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
index d02379ebacf1..ee56e1150c2c 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
@@ -44,8 +44,8 @@ import java.util.List;
  */
 public class JpsProjectImpl extends JpsRootElementBase<JpsProjectImpl> implements JpsProject {
   private static final JpsElementCollectionRole<JpsElementReference<?>> EXTERNAL_REFERENCES_COLLECTION_ROLE =
-    JpsElementCollectionRole.create(JpsElementChildRoleBase.<JpsElementReference<?>>create("external reference"));
-  private static final JpsElementCollectionRole<JpsRunConfiguration> RUN_CONFIGURATIONS_ROLE = JpsElementCollectionRole.create(JpsElementChildRoleBase.<JpsRunConfiguration>create("run configuration"));
+    JpsElementCollectionRole.create(JpsElementChildRoleBase.create("external reference"));
+  private static final JpsElementCollectionRole<JpsRunConfiguration> RUN_CONFIGURATIONS_ROLE = JpsElementCollectionRole.create(JpsElementChildRoleBase.create("run configuration"));
   private final JpsLibraryCollection myLibraryCollection;
   private String myName = "";
 
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
index bd447a4f103a..3784c374f3d5 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
@@ -16,8 +16,8 @@
 package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
 import org.jetbrains.jps.model.ex.JpsCompositeElementBase;
+import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
 import org.jetbrains.jps.model.ex.JpsElementCollectionRole;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryReference;
@@ -31,7 +31,7 @@ import java.util.List;
  */
 public class JpsDependenciesListImpl extends JpsCompositeElementBase<JpsDependenciesListImpl> implements JpsDependenciesList {
   public static final JpsElementCollectionRole<JpsDependencyElement> DEPENDENCY_COLLECTION_ROLE =
-    JpsElementCollectionRole.create(JpsElementChildRoleBase.<JpsDependencyElement>create("dependency"));
+    JpsElementCollectionRole.create(JpsElementChildRoleBase.create("dependency"));
 
   public JpsDependenciesListImpl() {
     super();
diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractProjectDataService.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractProjectDataService.java
index 8c9700ffaf49..6106df089be8 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractProjectDataService.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractProjectDataService.java
@@ -36,7 +36,7 @@ import java.util.Collections;
 public abstract class AbstractProjectDataService<E, I> implements ProjectDataService<E, I> {
 
   public final Computable.PredefinedValueComputable<Collection<I>> EMPTY_LIST =
-    new Computable.PredefinedValueComputable<>(Collections.<I>emptyList());
+    new Computable.PredefinedValueComputable<>(Collections.emptyList());
 
   @NotNull
   @Override
diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java b/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java
index 8c9ecdef09e7..953c3e6422ea 100644
--- a/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java
+++ b/platform/lang-api/src/com/intellij/facet/frameworks/SettingsConnectionService.java
@@ -82,7 +82,7 @@ public abstract class SettingsConnectionService {
           LOG.info(e);
         }
         return settings;
-      }, Collections.<String, String>emptyMap(), LOG);
+      }, Collections.emptyMap(), LOG);
   }
 
   @Nullable
diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/TextWithMarkupProcessor.java b/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/TextWithMarkupProcessor.java
index c5a5ec1ea161..4a445823fffa 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/TextWithMarkupProcessor.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/richcopy/TextWithMarkupProcessor.java
@@ -132,7 +132,7 @@ public class TextWithMarkupProcessor extends CopyPastePostProcessor<RawTextWithM
       logSyntaxInfo(syntaxInfo);
 
       createResult(syntaxInfo, editor);
-      return ObjectUtils.notNull(myResult, Collections.<RawTextWithMarkup>emptyList());
+      return ObjectUtils.notNull(myResult, Collections.emptyList());
     }
     catch (Throwable t) {
       // catching the exception so that the rest of copy/paste functionality can still work fine
diff --git a/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java b/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
index 04dc0dbb05c0..08b90d5efe92 100644
--- a/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
+++ b/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
@@ -159,7 +159,7 @@ public class SliceLeafAnalyzer {
 
   public Map<SliceNode, Collection<PsiElement>> createMap() {
     return ConcurrentFactoryMap.createMap(k -> ConcurrentCollectionFactory.createConcurrentSet(myLeafEquality),
-                                          () -> ConcurrentCollectionFactory.createMap(ContainerUtil.<SliceNode>identityStrategy()));
+                                          () -> ConcurrentCollectionFactory.createMap(ContainerUtil.identityStrategy()));
   }
 
   static class SliceNodeGuide implements WalkingState.TreeGuide<SliceNode> {
diff --git a/platform/lvcs-impl/src/com/intellij/history/core/revisions/Revision.java b/platform/lvcs-impl/src/com/intellij/history/core/revisions/Revision.java
index 24870b09eafb..50df113912fa 100644
--- a/platform/lvcs-impl/src/com/intellij/history/core/revisions/Revision.java
+++ b/platform/lvcs-impl/src/com/intellij/history/core/revisions/Revision.java
@@ -50,7 +50,7 @@ public abstract class Revision {
   }
 
   public Pair<List<String>, Integer> getAffectedFileNames() {
-    return Pair.create(Collections.<String>emptyList(), 0);
+    return Pair.create(Collections.emptyList(), 0);
   }
 
   public abstract Entry findEntry();
diff --git a/platform/platform-impl/src/com/intellij/util/ui/CollectionModelEditor.java b/platform/platform-impl/src/com/intellij/util/ui/CollectionModelEditor.java
index 1ed232032357..b7ada2570d0b 100644
--- a/platform/platform-impl/src/com/intellij/util/ui/CollectionModelEditor.java
+++ b/platform/platform-impl/src/com/intellij/util/ui/CollectionModelEditor.java
@@ -94,7 +94,7 @@ public abstract class CollectionModelEditor<T, E extends CollectionItemEditor<T>
   }
 
   protected class ModelHelper {
-    final OrderedSet<T> originalItems = new OrderedSet<>(ContainerUtil.<T>identityStrategy());
+    final OrderedSet<T> originalItems = new OrderedSet<>(ContainerUtil.identityStrategy());
 
     private final THashMap<T, T> modifiedToOriginal = ContainerUtil.newIdentityTroveMap();
     private final THashMap<T, T> originalToModified = ContainerUtil.newIdentityTroveMap();
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java
index 4c806914d92b..fb158c34132e 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java
@@ -413,7 +413,7 @@ public class VcsLogRefresherImpl implements VcsLogRefresher, Disposable {
     @NotNull
     Map<VirtualFile, VcsLogProvider.Requirements> asMap(@NotNull Collection<VirtualFile> roots) {
       return ContainerUtil
-        .map2Map(roots, root -> Pair.<VirtualFile, VcsLogProvider.Requirements>create(root, this));
+        .map2Map(roots, root -> Pair.create(root, this));
     }
   }
 
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java
index 4181bed52cbb..9e875afa6e73 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java
@@ -121,7 +121,7 @@ public class CommittedListsSequencesZipperTest {
         group.add(location);
       }
 
-      return Pair.create(Collections.singletonList(group), Collections.<RepositoryLocation>emptyList());
+      return Pair.create(Collections.singletonList(group), Collections.emptyList());
     }
 
     @Override
diff --git a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
index 39d39568367d..1fc5682df302 100644
--- a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
+++ b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
@@ -54,11 +54,11 @@ public class GitOutgoingChangesProvider implements VcsOutgoingChangesProvider<Co
     LOG.debug("getOutgoingChanges root: " + vcsRoot.getPath());
     final GitBranchesSearcher searcher = new GitBranchesSearcher(myProject, vcsRoot, findRemote);
     if (searcher.getLocal() == null || searcher.getRemote() == null) {
-      return new Pair<>(null, Collections.<CommittedChangeList>emptyList());
+      return new Pair<>(null, Collections.emptyList());
     }
     final GitRevisionNumber base = getMergeBase(myProject, vcsRoot, searcher.getLocal(), searcher.getRemote());
     if (base == null) {
-      return new Pair<>(null, Collections.<CommittedChangeList>emptyList());
+      return new Pair<>(null, Collections.emptyList());
     }
     final List<GitCommittedChangeList> lists = GitUtil.getLocalCommittedChanges(myProject, vcsRoot,
                                                                                 handler -> handler.addParameters(base.asString() + "..HEAD"));
diff --git a/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java b/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java
index a8a6d081a3dc..762c4060466c 100644
--- a/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java
+++ b/plugins/git4idea/src/git4idea/util/GitCommitCompareInfo.java
@@ -66,7 +66,7 @@ public class GitCommitCompareInfo {
     Pair<List<GitCommit>, List<GitCommit>> pair = myInfo.get(repo);
     if (pair == null) {
       LOG.error("Compare info not found for repository " + repo);
-      return Pair.create(Collections.<GitCommit>emptyList(), Collections.<GitCommit>emptyList());
+      return Pair.create(Collections.emptyList(), Collections.emptyList());
     }
     return pair;
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonDefaultImportContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonDefaultImportContributor.java
index ce2cb7d67dbd..0b2b1491f05d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonDefaultImportContributor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonDefaultImportContributor.java
@@ -50,7 +50,7 @@ public class GriffonDefaultImportContributor implements GrImportContributor {
           }
         }
 
-        return Result.create(Couple.<List<String>>of(new ArrayList<>(), new ArrayList<>()),
+        return Result.create(Couple.of(new ArrayList<>(), new ArrayList<>()),
                              PsiModificationTracker.MODIFICATION_COUNT);
       }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java
index 5b43ce2e2d03..a9f4cfe12c0c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/MethodOrClosureScopeChooser.java
@@ -121,7 +121,7 @@ public class MethodOrClosureScopeChooser {
     panel.add(scrollPane, BorderLayout.CENTER);
 
     final List<Pair<ActionListener, KeyStroke>> keyboardActions = Collections.singletonList(
-      Pair.<ActionListener, KeyStroke>create(new ActionListener() {
+      Pair.create(new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
           final GrParametersOwner ToSearchIn = (GrParametersOwner)list.getSelectedValue();
diff --git a/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java b/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java
index e6a1e4d77b0d..a4a9b06fa1eb 100644
--- a/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java
+++ b/plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java
@@ -62,7 +62,7 @@ public class InlinePropertyHandler extends JavaInlineActionHandler {
     final String propertyValue = property.getValue();
     if (propertyValue == null) return;
 
-    final List<PsiElement> occurrences = Collections.synchronizedList(ContainerUtil.<PsiElement>newArrayList());
+    final List<PsiElement> occurrences = Collections.synchronizedList(ContainerUtil.newArrayList());
     final Collection<PsiFile> containingFiles = Collections.synchronizedSet(new HashSet<PsiFile>());
     containingFiles.add(psiElement.getContainingFile());
     boolean result = ReferencesSearch.search(psiElement).forEach(
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index 0a56063679db..9bafad5ea57c 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -86,7 +86,7 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
   private final Map<String, XBreakpoint<? extends ExceptionBreakpointProperties>> myRegisteredExceptionBreakpoints =
     new ConcurrentHashMap<>();
 
-  private final List<PyThreadInfo> mySuspendedThreads = Collections.synchronizedList(Lists.<PyThreadInfo>newArrayList());
+  private final List<PyThreadInfo> mySuspendedThreads = Collections.synchronizedList(Lists.newArrayList());
   private final Map<String, XValueChildrenList> myStackFrameCache = Maps.newConcurrentMap();
   private final Object myFrameCacheObject = new Object();
   private final Map<String, PyDebugValue> myNewVariableValue = Maps.newHashMap();