diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt
index dc646eb9dc8..a81404a132a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt
@@ -16,14 +16,12 @@
 
 package org.jetbrains.jet.lang.evaluate
 
-import com.intellij.psi.tree.IElementType
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.psi.*
 import org.jetbrains.jet.lang.resolve.*
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
 import org.jetbrains.jet.lang.resolve.constants.*
-import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
@@ -36,7 +34,6 @@ import java.math.BigInteger
 import org.jetbrains.jet.lang.diagnostics.Errors
 import com.intellij.psi.util.PsiTreeUtil
 
-[suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")]
 public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor<CompileTimeConstant<*>, JetType>() {
 
     class object {
@@ -166,16 +163,15 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
             return createCompileTimeConstant(result, expectedType)
         }
         else {
-            return evaluateCall(expression, expression.getOperationReference(), leftExpression, expectedType)
+            return evaluateCall(expression.getOperationReference(), leftExpression, expectedType)
         }
     }
 
-    private fun evaluateCall(fullExpression: JetExpression, callExpression: JetExpression, receiverExpression: JetExpression, expectedType: JetType?): CompileTimeConstant<*>? {
+    private fun evaluateCall(callExpression: JetExpression, receiverExpression: JetExpression, expectedType: JetType?): CompileTimeConstant<*>? {
         val resolvedCall = trace.getBindingContext().get(BindingContext.RESOLVED_CALL, callExpression)
         if (resolvedCall == null) return null
 
-        val resultingDescriptorName = resolvedCall.getResultingDescriptor()?.getName()
-        if (resultingDescriptorName == null) return null
+        val resultingDescriptorName = resolvedCall.getResultingDescriptor().getName()
 
         val argumentForReceiver = createOperationArgumentForReceiver(resolvedCall, receiverExpression)
         if (argumentForReceiver == null) return null
@@ -285,7 +281,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
         val leftExpression = expression.getBaseExpression()
         if (leftExpression == null) return null
 
-        return evaluateCall(expression, expression.getOperationReference(), leftExpression, expectedType)
+        return evaluateCall(expression.getOperationReference(), leftExpression, expectedType)
     }
 
     override fun visitSimpleNameExpression(expression: JetSimpleNameExpression, expectedType: JetType?): CompileTimeConstant<*>? {
@@ -323,7 +319,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
             }
 
             val receiverExpression = expression.getReceiverExpression()
-            return evaluateCall(expression, calleeExpression, receiverExpression, expectedType)
+            return evaluateCall(calleeExpression, receiverExpression, expectedType)
         }
 
         // MyEnum.A, Integer.MAX_VALUE
@@ -339,7 +335,6 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
         if (call == null) return null
 
         val resultingDescriptor = call.getResultingDescriptor()
-        if (resultingDescriptor == null) return null
 
         // array()
         if (CompileTimeConstantUtils.isArrayMethodCall(call)) {
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt
index 4acb59ce4e9..4bc4fe96a92 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt
@@ -63,7 +63,6 @@ object JetFileReferencesResolver {
 
         public val result: Map<JetReferenceExpression, BindingContext> = resolveMap
 
-        [suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")]
         override fun visitUserType(userType: JetUserType) {
             if (visitReceivers) {
                 userType.acceptChildren(this)
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
index 6a2e3993599..e13d609dda6 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt
@@ -5,7 +5,6 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
-import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 import org.jetbrains.jet.plugin.project.ResolveSessionForBodies;
 import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
@@ -14,13 +13,11 @@ import org.jetbrains.jet.renderer.DescriptorRenderer;
 import java.util.Collections;
 import java.util.HashSet;
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.util.containers.HashMap
 import java.util.ArrayList
 import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
 import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPropertyDescriptor
 import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyPackageFragmentForJavaClass
 import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor
-import kotlin.support.AbstractIterator
 
 public object ShortenReferences {
     public fun process(element: JetElement) {
@@ -60,7 +57,6 @@ public object ShortenReferences {
 
         private fun bindingContext(expression: JetReferenceExpression): BindingContext = resolveMap[expression]!!
 
-        [suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")]
         override fun visitUserType(userType: JetUserType) {
             userType.getTypeArgumentList()?.accept(this)
 
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
index da01c55b55b..42449916933 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
@@ -26,7 +26,6 @@ import org.jetbrains.jet.plugin.JetBundle
 import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser
 import org.jetbrains.jet.asJava.getRepresentativeLightMethod
 import com.intellij.psi.PsiMethod
-import java.text.MessageFormat
 import com.intellij.psi.ElementDescriptionUtil
 import com.intellij.refactoring.util.RefactoringDescriptionLocation
 import org.jetbrains.jet.lang.psi.JetDeclaration
@@ -45,7 +44,6 @@ class KotlinOverrideHierarchyBrowser(
     override fun isApplicableElement(psiElement: PsiElement): Boolean =
             HierarchyUtils.IS_OVERRIDE_HIERARCHY_ELEMENT(psiElement)
 
-    [suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")]
     override fun createHierarchyTreeStructure(typeName: String, psiElement: PsiElement): HierarchyTreeStructure? =
             if (typeName == MethodHierarchyBrowserBase.METHOD_TYPE) KotlinOverrideTreeStructure(myProject, psiElement) else null
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverrideAnnotation.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverrideAnnotation.kt
index 98bbc226995..47a99e54da0 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverrideAnnotation.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverrideAnnotation.kt
@@ -20,7 +20,6 @@ import com.intellij.psi.PsiElement
 import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteCustomUsageInfo
 import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteUsageInfo
 
-[suppress("DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES")]
 public class KotlinSafeDeleteOverrideAnnotation(
         element: PsiElement, referencedElement: PsiElement
 ) : SafeDeleteUsageInfo(element, referencedElement), SafeDeleteCustomUsageInfo {
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt
index 0ced9f24fc1..5ea1f18bea5 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteOverridingUsageInfo.kt
@@ -21,7 +21,6 @@ import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteCustomUsageInfo
 import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteUsageInfo
 import org.jetbrains.jet.lang.psi.JetPsiUtil
 
-[suppress("DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES")]
 public class KotlinSafeDeleteOverridingUsageInfo(
         overridingElement: PsiElement, superElement: PsiElement
 ) : SafeDeleteUsageInfo(overridingElement, superElement), SafeDeleteCustomUsageInfo {