diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
index 2e913cabcca..1d8a5b71e12 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -58,8 +58,8 @@ private class ClassClsStubBuilder(
         private val classProto: ProtoBuf.Class,
         private val nameResolver: NameResolver,
         private val classId: ClassId,
-        private val source: SourceElement?,
-        private val outerContext: ClsStubBuilderContext
+        source: SourceElement?,
+        outerContext: ClsStubBuilderContext
 ) {
     private val thisAsProtoContainer = ProtoContainer.Class(
             classProto, nameResolver, TypeTable(classProto.typeTable), source, outerContext.protoContainer
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
index ccf05abf2d3..e5dbe520f2e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
@@ -28,7 +28,7 @@ import java.io.DataInput
 import java.io.DataOutput
 import java.util.*
 
-abstract class KotlinFileIndexBase<T>(private val classOfIndex: Class<T>) : ScalarIndexExtension<FqName>() {
+abstract class KotlinFileIndexBase<T>(classOfIndex: Class<T>) : ScalarIndexExtension<FqName>() {
     val KEY: ID<FqName, Void> = ID.create(classOfIndex.canonicalName)
 
     private val KEY_DESCRIPTOR : KeyDescriptor<FqName> = object : KeyDescriptor<FqName> {
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt
index 0725999a2f6..2907e654af0 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt
@@ -31,7 +31,7 @@ class LookupElementsCollector(
         private val prefixMatcher: PrefixMatcher,
         private val completionParameters: CompletionParameters,
         resultSet: CompletionResultSet,
-        private val sorter: CompletionSorter
+        sorter: CompletionSorter
 ) {
 
     private val elements = ArrayList<LookupElement>()
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt
index 7ecc711f8f0..a2f7c819d48 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt
@@ -257,7 +257,7 @@ class SmartCompletionInBasicWeigher(
     }
 }
 
-class PreferContextElementsWeigher(private val context: DeclarationDescriptor) : LookupElementWeigher("kotlin.preferContextElements", true, false) {
+class PreferContextElementsWeigher(context: DeclarationDescriptor) : LookupElementWeigher("kotlin.preferContextElements", true, false) {
     private val contextElements = context.parentsWithSelf
             .takeWhile { it !is PackageFragmentDescriptor }
             .toList()
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
index 512808300d2..129b1995d50 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
@@ -306,8 +306,8 @@ class TypeInstantiationItems(
 
     private inner class InheritanceSearcher(
             private val psiClass: PsiClass,
-            private val classDescriptor: ClassDescriptor,
-            private val typeArgs: List<TypeProjection>,
+            classDescriptor: ClassDescriptor,
+            typeArgs: List<TypeProjection>,
             private val freeParameters: Collection<TypeParameterDescriptor>,
             private val tail: Tail?) : InheritanceItemsSearcher {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
index 6a1d5923844..594ca069558 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
@@ -196,7 +196,7 @@ private class Prioritizer(private val file: KtFile, private val compareNames: Bo
     private val classifier = ImportableFqNameClassifier(file)
     private val proximityComparator = PsiProximityComparator(file)
 
-    inner class Priority(private val descriptor: DeclarationDescriptor) : Comparable<Priority> {
+    inner class Priority(descriptor: DeclarationDescriptor) : Comparable<Priority> {
         private val isDeprecated = KotlinBuiltIns.isDeprecated(descriptor)
         private val fqName = descriptor.importableFqName!!
         private val classification = classifier.classify(fqName, false)
@@ -226,7 +226,7 @@ private class Prioritizer(private val file: KtFile, private val compareNames: Bo
     data class VariantWithPriority(val variant: AutoImportVariant, val priority: Priority)
 }
 
-private class DescriptorGroupPrioritizer(private val file: KtFile) {
+private class DescriptorGroupPrioritizer(file: KtFile) {
     private val prioritizer = Prioritizer(file, false)
 
     inner class Priority(val descriptors: List<DeclarationDescriptor>) : Comparable<Priority> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt
index ed4b5002636..1f1b554048a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt
@@ -45,7 +45,7 @@ import org.jetbrains.kotlin.types.KotlinType
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
-class KotlinDebuggerCaches(private val project: Project) {
+class KotlinDebuggerCaches(project: Project) {
 
     private val cachedCompiledData = CachedValuesManager.getManager(project).createCachedValue(
             {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ClassUsageReplacementStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ClassUsageReplacementStrategy.kt
index 0f57e80c69d..f7c5a0258a4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ClassUsageReplacementStrategy.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ClassUsageReplacementStrategy.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.check
 class ClassUsageReplacementStrategy(
         typeReplacement: KtUserType?,
         constructorReplacement: ReplaceWithAnnotationAnalyzer.ReplacementExpression?,
-        private val project: Project
+        project: Project
 ) : UsageReplacementStrategy {
 
     private val factory = KtPsiFactory(project)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
index 618622ca521..5d931c55bc0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
@@ -159,7 +159,7 @@ interface OutputValue {
             val elementsToReplace: List<KtExpression>,
             val elementToInsertAfterCall: KtElement?,
             val conditional: Boolean,
-            private val builtIns: KotlinBuiltIns
+            builtIns: KotlinBuiltIns
     ): OutputValue {
         override val originalExpressions: List<KtExpression> get() = elementsToReplace
         override val valueType: KotlinType = with(builtIns) { if (conditional) booleanType else unitType }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt
index 28407cde51e..edf9e4ff25a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt
@@ -51,7 +51,7 @@ class KotlinIntroduceParameterDialog private constructor(
         val descriptor: IntroduceParameterDescriptor,
         val lambdaExtractionDescriptor: ExtractableCodeDescriptor?,
         nameSuggestions: Array<String>,
-        val typeSuggestions: List<KotlinType>,
+        typeSuggestions: List<KotlinType>,
         val helper: KotlinIntroduceParameterHelper
 ): RefactoringDialog(project, true) {
     constructor(