diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java
index 960db5832fc4..65f6cc9bbf0a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,7 +168,7 @@ public class ImplementAbstractMethodHandler {
       if (!inheritor.isInterface() || PsiUtil.isLanguageLevel8OrHigher(inheritor)) {
         final PsiSubstitutor classSubstitutor = TypeConversionUtil.getClassSubstitutor(psiClass, inheritor, PsiSubstitutor.EMPTY);
         PsiMethod method = classSubstitutor != null ? MethodSignatureUtil.findMethodBySignature(inheritor, myMethod.getSignature(classSubstitutor), true)
-                                                    : inheritor.findMethodBySignature(myMethod, true);;
+                                                    : inheritor.findMethodBySignature(myMethod, true);
         if (method == null || !psiClass.equals(method.getContainingClass())) continue;
         list.add(inheritor);
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java
index c606645f02dd..80cea560214b 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterClassObjectAccess.java
@@ -3,6 +3,6 @@ class Test {
   {
     ((Runnable) () -> {
 
-    }).getClass();;
+    }).getClass();
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java
index 6154328509eb..2671e4744cec 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java
@@ -6,6 +6,6 @@ class Test {
         public void run() {
           
         }
-    }.getClass();;
+    }.getClass();
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/generics/returnType/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/returnType/src/Client.java
index d3e1b6fd93fa..62cba3ac85af 100644
--- a/java/java-tests/testData/compileServer/incremental/generics/returnType/src/Client.java
+++ b/java/java-tests/testData/compileServer/incremental/generics/returnType/src/Client.java
@@ -1,7 +1,7 @@
 public class Client {
   public void bar() {
     GenericType<Integer> list = new Server().foo();
-    System.out.println("list = " + list);;
+    System.out.println("list = " + list);
   }
 
   public static void main(String[] args){
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java
index 06b2bcbe2803..2513f1a76363 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/HTMLComposerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -330,7 +330,7 @@ public abstract class HTMLComposerImpl extends HTMLComposer {
 
   @Override
   public void appendNoProblems(StringBuffer buf) {
-    buf.append("<p class=\"problem-description-group\">");;
+    buf.append("<p class=\"problem-description-group\">");
     buf.append(InspectionsBundle.message("inspection.export.results.no.problems.found"));
     buf.append("</p>");
   }
diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
index aca89133eecd..6fdc50db8433 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -515,7 +515,7 @@ public class PsiUtilCore {
       append(" length=").append(file.getLength());
     sb.append("\nproject=").append(project.getName()).
       append(" default=").append(project.isDefault()).
-      append(" open=").append(project.isOpen());;
+      append(" open=").append(project.isOpen());
     sb.append("\nfileType=").append(fileType.getName()).append("/").append(fileType.getClass().getName());
     sb.append("\nisIgnored=").append(ignored);
     sb.append(" underIgnored=").append(indexFacade.isUnderIgnored(file));
diff --git a/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java b/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java
index ea38c26ed094..c4217a2d44a8 100644
--- a/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java
+++ b/platform/platform-api/src/com/intellij/ui/CheckboxTreeBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import java.awt.*;
 
 public class CheckboxTreeBase extends Tree {
   private final CheckboxTreeHelper myHelper;
-  private final EventDispatcher<CheckboxTreeListener> myEventDispatcher = EventDispatcher.create(CheckboxTreeListener.class);;
+  private final EventDispatcher<CheckboxTreeListener> myEventDispatcher = EventDispatcher.create(CheckboxTreeListener.class);
 
   public CheckboxTreeBase() {
     this(new CheckboxTreeCellRendererBase(), null);
diff --git a/platform/platform-api/src/com/intellij/ui/components/SmoothScrollPane.java b/platform/platform-api/src/com/intellij/ui/components/SmoothScrollPane.java
index 1887a15200d0..0d042307545b 100644
--- a/platform/platform-api/src/com/intellij/ui/components/SmoothScrollPane.java
+++ b/platform/platform-api/src/com/intellij/ui/components/SmoothScrollPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,7 +226,7 @@ public class SmoothScrollPane extends JScrollPane {
     public void setCurrentValue(int value) {
       super.setValue(value);
 
-      myAdjuster.reset();;
+      myAdjuster.reset();
     }
 
     @Override
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
index baa4f94b483d..9789fe0a779d 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
     assertNotNull(myTemplateManager.getTemplate("foo.txt"));
 
     File foo = PlatformTestCase.createTempDir("foo");
-    final Project project = ProjectManager.getInstance().createProject("foo", foo.getPath());;
+    final Project project = ProjectManager.getInstance().createProject("foo", foo.getPath());
     try {
       assertNotNull(project);
       assertNotNull(FileTemplateManager.getInstance(project).getTemplate("foo.txt"));
@@ -143,7 +143,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
 
   public void testAddRemoveShared() throws Exception {
     File foo = PlatformTestCase.createTempDir("foo");
-    final Project project = ProjectManager.getInstance().createProject("foo", foo.getPath());;
+    final Project project = ProjectManager.getInstance().createProject("foo", foo.getPath());
     try {
       assertNotNull(project);
       FileTemplateManager manager = FileTemplateManager.getInstance(project);
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/imports/ReplaceStaticImportFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/imports/ReplaceStaticImportFixTest.java
index 7b4cfbdf2dfd..f4adb436fe41 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/imports/ReplaceStaticImportFixTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/imports/ReplaceStaticImportFixTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ public class ReplaceStaticImportFixTest extends IGQuickFixesTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     myFixture.enableInspections(new StaticImportInspection());
-    myDefaultHint = InspectionGadgetsBundle.message("static.import.replace.quickfix");;
+    myDefaultHint = InspectionGadgetsBundle.message("static.import.replace.quickfix");
     myRelativePath = "imports/static_import";
   }
 
diff --git a/python/src/com/jetbrains/commandInterface/commandLine/psi/ValidationResultImpl.java b/python/src/com/jetbrains/commandInterface/commandLine/psi/ValidationResultImpl.java
index dab5b16bd2b6..d0c0a53f8ee4 100644
--- a/python/src/com/jetbrains/commandInterface/commandLine/psi/ValidationResultImpl.java
+++ b/python/src/com/jetbrains/commandInterface/commandLine/psi/ValidationResultImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ final class ValidationResultImpl extends CommandLineVisitor implements Validatio
         myOptions.put(optionName, option);
       }
     }
-    myUnusedOptions.putAll(myOptions);;
+    myUnusedOptions.putAll(myOptions);
     myCommand = command;
   }
 
diff --git a/python/src/com/jetbrains/python/codeInsight/fstrings/FStringParser.java b/python/src/com/jetbrains/python/codeInsight/fstrings/FStringParser.java
index cb517aefcf47..4b5d96130de3 100644
--- a/python/src/com/jetbrains/python/codeInsight/fstrings/FStringParser.java
+++ b/python/src/com/jetbrains/python/codeInsight/fstrings/FStringParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -234,7 +234,7 @@ public class FStringParser {
 
     private ParseResult(@NotNull List<Integer> singleRightBraces, @NotNull List<Fragment> fragments) {
       mySingleRightBraces = singleRightBraces;
-      myFragments = ContainerUtil.sorted(fragments, (f1, f2) -> f1.getLeftBraceOffset() - f2.getLeftBraceOffset());;
+      myFragments = ContainerUtil.sorted(fragments, (f1, f2) -> f1.getLeftBraceOffset() - f2.getLeftBraceOffset());
     }
 
     @NotNull
diff --git a/python/testSrc/com/jetbrains/python/toolbox/IteratorsTest.java b/python/testSrc/com/jetbrains/python/toolbox/IteratorsTest.java
index 5d9f831d9062..af7c9e5a761f 100644
--- a/python/testSrc/com/jetbrains/python/toolbox/IteratorsTest.java
+++ b/python/testSrc/com/jetbrains/python/toolbox/IteratorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,7 +103,7 @@ public class IteratorsTest extends TestCase {
   public void testToStringDoesntExhaustIterator() {
     final ChainIterable<String> initial = new ChainIterable<>();
     initial.addItem("foo");
-    assertEquals("foo", initial.toString());;
+    assertEquals("foo", initial.toString());
     assertEquals("foo", initial.toString());
   }
 }