diff --git a/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.kt b/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.kt
index 23790846b4b2..3cd9c4c5e5c5 100644
--- a/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.kt
+++ b/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.kt
@@ -34,7 +34,7 @@ internal val kotlinEditorOptionsDescriptors
         cbConvertPastedJavaToKotlin,
         cbDontShowJavaToKotlinConversionDialog,
         cbAutoAddValKeywordToCtorParameters
-    ).map(CheckboxDescriptor::asUiOptionDescriptor)
+    ).map(CheckboxDescriptor::asUiOptionDescriptor).toList()
 
 class KotlinEditorOptionsConfigurable : BeanConfigurable<KotlinEditorOptions>(editorOptions, message(ID)) {
 
diff --git a/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsTopHitProvider.kt b/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsTopHitProvider.kt
index 84c5abae558b..e6fdab51d016 100644
--- a/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsTopHitProvider.kt
+++ b/plugins/kotlin/kotlin.ide/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsTopHitProvider.kt
@@ -11,8 +11,5 @@ import kotlin.sequences.toList
 class KotlinEditorOptionsTopHitProvider : OptionsSearchTopHitProvider.ApplicationLevelProvider {
     override fun getId(): String = ID
 
-    override fun getOptions(): Collection<OptionDescription> =
-        kotlinEditorOptionsDescriptors
-            .map { c -> if (c is ConfigurableWrapper) c.configurable else c }
-            .filterIsInstance<OptionDescription>().toList()
+    override fun getOptions(): Collection<OptionDescription> = kotlinEditorOptionsDescriptors
 }
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedFunctionDialog.kt b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedFunctionDialog.kt
index 7a0ecb9f5fc1..dd07feb14924 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedFunctionDialog.kt
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedFunctionDialog.kt
@@ -21,9 +21,7 @@ abstract class AbstractKotlinInlineNamedFunctionDialog(
     }
 
     override fun canInlineThisOnly() = allowToInlineThisOnly
-    override fun doHelpAction() = HelpManager.getInstance().invokeHelp(
-        if (declaration is KtConstructor<*>) HelpID.INLINE_CONSTRUCTOR else HelpID.INLINE_METHOD
-    )
+    override fun doHelpAction() = HelpManager.getInstance().invokeHelp(HelpID.INLINE_METHOD)
 
     override val inlineThisOption: KMutableProperty1<KotlinCommonRefactoringSettings, Boolean> get() = KotlinCommonRefactoringSettings::INLINE_METHOD_THIS
     override val inlineKeepOption: KMutableProperty1<KotlinCommonRefactoringSettings, Boolean> get() = KotlinCommonRefactoringSettings::INLINE_METHOD_KEEP
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/parametersUtil.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/parametersUtil.kt
index 1ffec28daebd..ca7513a339e5 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/parametersUtil.kt
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/extractFunction/parametersUtil.kt
@@ -11,89 +11,26 @@ import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
 import org.jetbrains.kotlin.analysis.api.KaImplementationDetail
 import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.analyze
-import org.jetbrains.kotlin.analysis.api.resolution.KaCallableMemberCall
-import org.jetbrains.kotlin.analysis.api.resolution.KaExplicitReceiverValue
-import org.jetbrains.kotlin.analysis.api.resolution.KaImplicitReceiverValue
-import org.jetbrains.kotlin.analysis.api.resolution.KaPartiallyAppliedSymbol
-import org.jetbrains.kotlin.analysis.api.resolution.KaReceiverValue
-import org.jetbrains.kotlin.analysis.api.resolution.KaSmartCastedReceiverValue
-import org.jetbrains.kotlin.analysis.api.resolution.singleCallOrNull
-import org.jetbrains.kotlin.analysis.api.resolution.symbol
-import org.jetbrains.kotlin.analysis.api.components.KaDiagnosticCheckerFilter
-import org.jetbrains.kotlin.analysis.api.components.buildClassType
-import org.jetbrains.kotlin.analysis.api.components.buildSubstitutor
-import org.jetbrains.kotlin.analysis.api.components.builtinTypes
-import org.jetbrains.kotlin.analysis.api.components.callableSymbol
-import org.jetbrains.kotlin.analysis.api.components.containingDeclaration
-import org.jetbrains.kotlin.analysis.api.components.expectedType
-import org.jetbrains.kotlin.analysis.api.components.expressionType
-import org.jetbrains.kotlin.analysis.api.components.render
-import org.jetbrains.kotlin.analysis.api.components.resolveToCall
-import org.jetbrains.kotlin.analysis.api.components.type
+import org.jetbrains.kotlin.analysis.api.components.*
 import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
-import org.jetbrains.kotlin.analysis.api.resolution.KaErrorCallInfo
+import org.jetbrains.kotlin.analysis.api.resolution.*
 import org.jetbrains.kotlin.analysis.api.signatures.KaCallableSignature
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.types.KaClassType
 import org.jetbrains.kotlin.analysis.api.types.KaType
-import org.jetbrains.kotlin.fir.BuiltinTypes
 import org.jetbrains.kotlin.idea.base.codeInsight.KotlinDeclarationNameValidator
 import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggester
 import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggester.Companion.suggestNameByName
 import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggestionProvider
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AddPrefixReplacement
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.FqNameReplacement
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ParametersInfo
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.RenameReplacement
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ResolveResult
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ResolvedReferenceInfo
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.TypeDescriptor
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.TypeParameter
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.WrapParameterInWithReplacement
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.collectReferencedTypes
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.collectRelevantConstraints
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.processTypeIfExtractable
-import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.resolveResult
+import org.jetbrains.kotlin.idea.k2.refactoring.introduce.K2SemanticMatcher.isSemanticMatch
+import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.lexer.KtToken
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtBlockExpression
-import org.jetbrains.kotlin.psi.KtCallExpression
-import org.jetbrains.kotlin.psi.KtCallableDeclaration
-import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.psi.KtConstructor
-import org.jetbrains.kotlin.psi.KtDestructuringDeclarationEntry
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtExpression
-import org.jetbrains.kotlin.psi.KtFunctionLiteral
-import org.jetbrains.kotlin.psi.KtNamedDeclaration
-import org.jetbrains.kotlin.psi.KtNamedFunction
-import org.jetbrains.kotlin.psi.KtOperationReferenceExpression
-import org.jetbrains.kotlin.psi.KtParameter
-import org.jetbrains.kotlin.psi.KtProperty
-import org.jetbrains.kotlin.psi.KtPropertyAccessor
-import org.jetbrains.kotlin.psi.KtQualifiedExpression
-import org.jetbrains.kotlin.psi.KtSimpleNameExpression
-import org.jetbrains.kotlin.psi.KtSuperExpression
-import org.jetbrains.kotlin.psi.KtThisExpression
-import org.jetbrains.kotlin.psi.KtTypeParameter
-import org.jetbrains.kotlin.psi.KtTypeParameterListOwner
-import org.jetbrains.kotlin.psi.KtTypeReference
-import org.jetbrains.kotlin.psi.KtUserType
-import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
-import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
-import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
-import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis
-import org.jetbrains.kotlin.psi.psiUtil.isInsideOf
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
-import org.jetbrains.kotlin.idea.k2.refactoring.introduce.K2SemanticMatcher.isSemanticMatch
-import org.jetbrains.kotlin.psi.KtPsiFactory
-import org.jetbrains.kotlin.psi.KtReferenceExpression
-import org.jetbrains.kotlin.psi.psiUtil.findLabelAndCall
 
 /**
  * Represents a parameter candidate as it's original declaration and a reference in code.
@@ -425,7 +362,6 @@ private fun ExtractionData.registerQualifierReplacements(
         if (fqName != null) {
             val name = when (originalDeclaration) {
                 is KtConstructor<*> -> null
-                is KtPropertyAccessor -> originalDeclaration.property.name
                 is KtClassOrObject -> null
                 else -> originalDeclaration.name
             }