diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java
index 614cc7ff155..f3ba7e94710 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStatementExpression.java
@@ -16,11 +16,6 @@
 
 package org.jetbrains.jet.lang.psi;
 
-/**
- * User: Alefas
- * Date: 31.01.12
- */
-
 /**
  * This is an interface to show that {@link JetExpression} is not
  * actually an expression (in meaning that this expression can be placed after "val x = ").
diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
index cd6e500ba68..100f889ff1e 100644
--- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
@@ -51,10 +51,6 @@ import java.awt.*;
 import java.util.*;
 import java.util.List;
 
-/**
- * User: Alefas
- * Date: 17.01.12
- */
 public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport<
         JetValueArgumentList,
         Pair<? extends FunctionDescriptor, CancelableResolveSession>,
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
index afcd63d4663..f818496b3f7 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
@@ -33,10 +33,6 @@ import java.util.Collection;
 import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.canRepresentPsiElement;
 import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.getClassOrObjectChildren;
 
-/**
- * User: Alefas
- * Date: 15.02.12
- */
 public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<JetClassOrObject> {
     protected JetClassOrObjectTreeNode(Project project, JetClassOrObject jetClassOrObject, ViewSettings viewSettings) {
         super(project, jetClassOrObject, viewSettings);
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
index a053791e533..ec56506a291 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
@@ -30,10 +30,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-/**
- * User: Alefas
- * Date: 15.02.12
- */
 public class JetDeclarationTreeNode extends AbstractPsiBasedNode<JetDeclaration> {
     public static final String CLASS_INITIALIZER = "<class initializer>";
 
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
index deb58733e45..d2b65995dfe 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
@@ -29,10 +29,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-/**
- * User: Alefas
- * Date: 15.02.12
- */
 public class JetFileTreeNode extends PsiFileNode {
     public JetFileTreeNode(Project project, JetFile value, ViewSettings viewSettings) {
         super(project, value, viewSettings);
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
index c5bec6cd2cf..edb3fc28fc6 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
@@ -36,10 +36,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-/**
- * User: Alefas
- * Date: 15.02.12
- */
 public class JetProjectViewProvider implements SelectableTreeStructureProvider, DumbAware {
     private Project myProject;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetIntroduceHandlerBase.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetIntroduceHandlerBase.java
index 9ac7fdf94da..df47ecd2f98 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetIntroduceHandlerBase.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetIntroduceHandlerBase.java
@@ -18,9 +18,5 @@ package org.jetbrains.jet.plugin.refactoring;
 
 import com.intellij.refactoring.RefactoringActionHandler;
 
-/**
- * User: Alefas
- * Date: 25.01.12
- */
 public abstract class JetIntroduceHandlerBase implements RefactoringActionHandler {
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
index 6fdb5eedc9f..cbd9d59773e 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
@@ -37,10 +37,6 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * User: Alefas
- * Date: 31.01.12
- */
 public class JetNameSuggester {
     private JetNameSuggester() {
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
index 3d2ac4e437e..317f8fa62ec 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
@@ -21,10 +21,6 @@ import com.intellij.openapi.project.Project;
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * User: Alefas
- * Date: 07.02.12
- */
 public abstract class JetNameValidator {
     private final Project project;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
index 15f9ce32f4e..bc3c1457be2 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
@@ -30,10 +30,6 @@ import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 
 import java.util.Collection;
 
-/**
- * User: Alefas
- * Date: 07.02.12
- */
 public class JetNameValidatorImpl extends JetNameValidator {
     private final PsiElement myContainer;
     private final PsiElement myAnchor;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
index 99635a0492c..64222d77a78 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringBundle.java
@@ -24,10 +24,6 @@ import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 
-/**
- * User: Alefas
- * Date: 25.01.12
- */
 public class JetRefactoringBundle {
     private static Reference<ResourceBundle> ourBundle;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java
index 4e976396942..d55c7b0be7d 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java
@@ -26,10 +26,6 @@ import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureHa
 import org.jetbrains.jet.plugin.refactoring.introduceVariable.JetIntroduceVariableHandler;
 import org.jetbrains.jet.plugin.refactoring.safeDelete.KotlinSafeDeleteProcessor;
 
-/**
- * User: Alefas
- * Date: 25.01.12
- */
 public class JetRefactoringSupportProvider extends RefactoringSupportProvider {
     @Override
     public boolean isSafeDeleteAvailable(PsiElement element) {
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
index b089daabd9e..da2ad5c60dc 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
@@ -58,10 +58,6 @@ import java.awt.*;
 import java.util.*;
 import java.util.List;
 
-/**
- * User: Alefas
- * Date: 25.01.12
- */
 public class JetRefactoringUtil {
 
     private JetRefactoringUtil() {
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetChangePropertyActions.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetChangePropertyActions.java
index 1c06808f987..ed7d55a1f7a 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetChangePropertyActions.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetChangePropertyActions.java
@@ -21,10 +21,6 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.jet.lang.psi.JetProperty;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
 
-/**
- * User: Alefas
- * Date: 14.02.12
- */
 public class JetChangePropertyActions {
     private JetChangePropertyActions() {
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
index b30cc50e433..8f80efa6834 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
@@ -45,10 +45,6 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-/**
- * User: Alefas
- * Date: 01.02.12
- */
 public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer<JetExpression> {
 
     private final boolean myReplaceOccurrence;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
index 7a27749d240..fb796e30a22 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
@@ -56,10 +56,6 @@ import org.jetbrains.jet.renderer.DescriptorRenderer;
 
 import java.util.*;
 
-/**
- * User: Alefas
- * Date: 25.01.12
- */
 public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
 
     private static final String INTRODUCE_VARIABLE = JetRefactoringBundle.message("introduce.variable");
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
index 3e947284e17..9a9dd364cbd 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
@@ -26,10 +26,6 @@ import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.project.CancelableResolveSession;
 
-/**
- * User: Alexander Podkhalyuzin
- * Date: 24.01.12
- */
 public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCase {
     public void testInheritedFunctions() {
         doTest();
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java
index 21882263d77..aaa355c99c1 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java
@@ -26,10 +26,6 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * User: Alexander Podkhalyuzin
- * Date: 24.01.12
- */
 public class MockCreateParameterInfoContext implements CreateParameterInfoContext {
     private Object[] myItemsToShow = ArrayUtil.EMPTY_OBJECT_ARRAY;
     private PsiElement myHighlightedElement = null;
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
index 211ad915f48..9781ead7150 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
@@ -24,10 +24,6 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.Collections;
 
-/**
- * User: Alexander Podkhalyuzin
- * Date: 24.01.12
- */
 public class MockParameterInfoUIContext implements ParameterInfoUIContext {
     private final PsiElement myParameterOwner;
     private final int myCurrentParameterIndex;
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java
index bb65b4d08d7..c7f57920c6c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java
@@ -25,10 +25,6 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * User: Alexander Podkhalyuzin
- * Date: 24.01.12
- */
 public class MockUpdateParameterInfoContext implements UpdateParameterInfoContext {
     private int myCurrentParameter = -1;
     private PsiFile myFile;
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableTest.java
index 1710005e0f7..61e3eaa047e 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableTest.java
@@ -24,10 +24,6 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 
-/**
- * User: Alefas
- * Date: 31.01.12
- */
 public class JetIntroduceVariableTest extends LightCodeInsightFixtureTestCase {
     public void testClassBody() {
         doTest();
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
index eb9a9ab1c5e..9410c01c518 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
@@ -30,10 +30,6 @@ import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 
 import java.util.Arrays;
 
-/**
- * User: Alefas
- * Date: 07.02.12
- */
 public class JetNameSuggesterTest extends LightCodeInsightFixtureTestCase {
     public void testArrayList() {
         doTest();
diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt
index f34e446f1b1..27f0a1f9670 100644
--- a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt
@@ -2,9 +2,6 @@ package test
 
 import java.io.File
 
-/**
- * User: ignatov
- */
 public class Test() {
     class object {
         public fun isDir(parent: File): Boolean {
diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.java b/j2k/tests/testData/ast/issues/kt-824-isDir.java
index 1526492d962..896b155885b 100644
--- a/j2k/tests/testData/ast/issues/kt-824-isDir.java
+++ b/j2k/tests/testData/ast/issues/kt-824-isDir.java
@@ -2,9 +2,6 @@
 package test;
 import java.io.File;
 
-/**
- * User: ignatov
- */
 public class Test {
     public static boolean isDir(File parent) {
         if (parent == null || !parent.exists()) {
diff --git a/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/main/kotlin/org/jetbrains/HelloWorld.kt
index c3a8fa7ca3a..bc4fbf7504e 100644
--- a/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/main/kotlin/org/jetbrains/HelloWorld.kt
+++ b/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/main/kotlin/org/jetbrains/HelloWorld.kt
@@ -1,9 +1,4 @@
 package org.jetbrains
-/**
- * User: danielpenkin
- * Date: 06.05.12
- * Time: 22:53
- */
 
 fun main(args : Array<String>) {
     System.out?.println(getGreeting())
diff --git a/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/test/java/org/jetbrains/HelloWorldJavaTest.java b/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/test/java/org/jetbrains/HelloWorldJavaTest.java
index 8c38663f289..e021388ec28 100644
--- a/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/test/java/org/jetbrains/HelloWorldJavaTest.java
+++ b/libraries/tools/kotlin-maven-plugin/src/it/test-helloworld/src/test/java/org/jetbrains/HelloWorldJavaTest.java
@@ -4,11 +4,6 @@ import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
 
-/**
- * User: danielpenkin
- * Date: 06.05.12
- * Time: 23:35
- */
 public class HelloWorldJavaTest {
 
     @Test