diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
index 2cd5c26ab19..9bc2864f48e 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
@@ -134,7 +134,7 @@ public object DebugSymbolRenderer {
             }
         }
 
-        if (symbol is KtPropertyGetterSymbol || symbol is KtPropertySetterSymbol || symbol is KtValueParameterSymbol || symbol is KtPropertySymbol) {
+        if (symbol is KtPropertyGetterSymbol || symbol is KtPropertySetterSymbol || symbol is KtValueParameterSymbol) {
             renderSymbol(symbol)
             return
         }
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt
deleted file mode 100644
index f55d661fa1f..00000000000
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-KtConstructorSymbol:
-  annotationsList: []
-  callableIdIfNonLocal: null
-  containingClassIdIfNonLocal: Anno
-  contextReceivers: []
-  hasStableParameterNames: true
-  isExtension: false
-  isPrimary: true
-  origin: SOURCE
-  receiverType: null
-  returnType: Anno
-  symbolKind: CLASS_MEMBER
-  typeParameters: []
-  valueParameters: [
-    KtValueParameterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /Anno.param1
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/String
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: param1
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/String
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: param1
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/String
-      symbolKind: LOCAL
-      typeParameters: []
-    KtValueParameterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /Anno.param2
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: param2
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: param2
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/Int
-      symbolKind: LOCAL
-      typeParameters: []
-  ]
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtNamedClassOrObjectSymbol:
-  annotationsList: []
-  classIdIfNonLocal: Anno
-  classKind: ANNOTATION_CLASS
-  companionObject: null
-  contextReceivers: []
-  isData: false
-  isExternal: false
-  isFun: false
-  isInline: false
-  isInner: false
-  modality: FINAL
-  name: Anno
-  origin: SOURCE
-  superTypes: [
-    kotlin/Annotation
-  ]
-  symbolKind: TOP_LEVEL
-  typeParameters: []
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtFunctionSymbol:
-  annotationsList: [
-    Anno(param1 = "funparam", param2 = 3)
-      psi: KtAnnotationEntry
-  ]
-  callableIdIfNonLocal: /X.x
-  contextReceivers: []
-  hasStableParameterNames: true
-  isBuiltinFunctionInvoke: false
-  isExtension: false
-  isExternal: false
-  isInfix: false
-  isInline: false
-  isOperator: false
-  isOverride: false
-  isStatic: false
-  isSuspend: false
-  modality: FINAL
-  name: x
-  origin: SOURCE
-  receiverType: null
-  returnType: kotlin/Unit
-  symbolKind: CLASS_MEMBER
-  typeParameters: []
-  valueParameters: []
-  visibility: Public
-  getDispatchReceiver(): X
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtNamedClassOrObjectSymbol:
-  annotationsList: [
-    Anno(param1 = "param", param2 = 2)
-      psi: KtAnnotationEntry
-  ]
-  classIdIfNonLocal: X
-  classKind: CLASS
-  companionObject: null
-  contextReceivers: []
-  isData: false
-  isExternal: false
-  isFun: false
-  isInline: false
-  isInner: false
-  modality: FINAL
-  name: X
-  origin: SOURCE
-  superTypes: [
-    kotlin/Any
-  ]
-  symbolKind: TOP_LEVEL
-  typeParameters: []
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
index fef688cfe5c..ce6eaf59a04 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /Anno.param1
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/String
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val param1: String)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: param1
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/String
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Anno.param1)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -75,49 +33,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /Anno.param2
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val param2: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: param2
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Anno.param2)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt
deleted file mode 100644
index 70fe88e590f..00000000000
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.descriptors.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-KtConstructorSymbol:
-  annotationsList: []
-  callableIdIfNonLocal: null
-  containingClassIdIfNonLocal: A
-  contextReceivers: []
-  hasStableParameterNames: true
-  isExtension: false
-  isPrimary: true
-  origin: SOURCE
-  receiverType: null
-  returnType: A
-  symbolKind: CLASS_MEMBER
-  typeParameters: []
-  valueParameters: [
-    KtValueParameterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /A.a
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: a
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: a
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/Int
-      symbolKind: LOCAL
-      typeParameters: []
-    KtValueParameterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: null
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: b
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/String
-      symbolKind: LOCAL
-      typeParameters: []
-  ]
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtNamedClassOrObjectSymbol:
-  annotationsList: []
-  classIdIfNonLocal: A
-  classKind: CLASS
-  companionObject: null
-  contextReceivers: []
-  isData: false
-  isExternal: false
-  isFun: false
-  isInline: false
-  isInner: false
-  modality: FINAL
-  name: A
-  origin: SOURCE
-  superTypes: [
-    kotlin/Any
-  ]
-  symbolKind: TOP_LEVEL
-  typeParameters: []
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
index b3457dab8aa..408bb3e4bd3 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /A.a
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val a: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: a
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/A.a)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
index a7002da1111..aaeb35ab740 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /MyColor.x
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: x
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.x)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -75,49 +33,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /MyColor.y
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: y
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.y)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -134,49 +50,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /MyColor.z
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: z
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.z)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
index 3b9d2a2bdd9..d55962ec07a 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /MyColor.x
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val x: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: x
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.x)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -75,49 +33,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /MyColor.y
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val y: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: y
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.y)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -134,49 +50,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /MyColor.z
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val z: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: z
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/MyColor.z)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt
deleted file mode 100644
index 68a60d40072..00000000000
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-KtConstructorSymbol:
-  annotationsList: []
-  callableIdIfNonLocal: null
-  containingClassIdIfNonLocal: P
-  contextReceivers: []
-  hasStableParameterNames: true
-  isExtension: false
-  isPrimary: true
-  origin: SOURCE
-  receiverType: null
-  returnType: P
-  symbolKind: CLASS_MEMBER
-  typeParameters: []
-  valueParameters: [
-    KtValueParameterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /P.x
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: x
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: x
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/Int
-      symbolKind: LOCAL
-      typeParameters: []
-    KtValueParameterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /P.y
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: y
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
-      hasDefaultValue: false
-      isCrossinline: false
-      isExtension: false
-      isImplicitLambdaParameter: false
-      isNoinline: false
-      isVararg: false
-      name: y
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/Int
-      symbolKind: LOCAL
-      typeParameters: []
-  ]
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtNamedClassOrObjectSymbol:
-  annotationsList: []
-  classIdIfNonLocal: P
-  classKind: CLASS
-  companionObject: null
-  contextReceivers: []
-  isData: true
-  isExternal: false
-  isFun: false
-  isInline: false
-  isInner: false
-  modality: FINAL
-  name: P
-  origin: SOURCE
-  superTypes: [
-    kotlin/Any
-  ]
-  symbolKind: TOP_LEVEL
-  typeParameters: []
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtLocalVariableSymbol:
-  annotationsList: []
-  callableIdIfNonLocal: null
-  contextReceivers: []
-  isExtension: false
-  isVal: true
-  name: l
-  origin: SOURCE
-  receiverType: null
-  returnType: kotlin/Int
-  symbolKind: LOCAL
-  typeParameters: []
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtLocalVariableSymbol:
-  annotationsList: []
-  callableIdIfNonLocal: null
-  contextReceivers: []
-  isExtension: false
-  isVal: true
-  name: r
-  origin: SOURCE
-  receiverType: null
-  returnType: kotlin/Int
-  symbolKind: LOCAL
-  typeParameters: []
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
-
-KtFunctionSymbol:
-  annotationsList: []
-  callableIdIfNonLocal: /destruct
-  contextReceivers: []
-  hasStableParameterNames: true
-  isBuiltinFunctionInvoke: false
-  isExtension: false
-  isExternal: false
-  isInfix: false
-  isInline: false
-  isOperator: false
-  isOverride: false
-  isStatic: false
-  isSuspend: false
-  modality: FINAL
-  name: destruct
-  origin: SOURCE
-  receiverType: null
-  returnType: kotlin/Int
-  symbolKind: TOP_LEVEL
-  typeParameters: []
-  valueParameters: []
-  visibility: Public
-  getContainingModule: KtSourceModule "Sources of main"
-  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt
index d18af0be673..9ee27c2b909 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /P.x
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val x: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: x
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/P.x)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
@@ -75,49 +33,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /P.y
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val y: Int)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: y
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/P.y)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
index 42428978d26..072e1dc3ea1 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /Style.value
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/String
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: null
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: false
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: value
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/String
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Style.value)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
index 2b6164a8e10..39b02eee8c7 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
@@ -16,49 +16,7 @@ KtConstructorSymbol:
       annotationsList: []
       callableIdIfNonLocal: null
       contextReceivers: []
-      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol:
-        annotationsList: []
-        callableIdIfNonLocal: /Style.value
-        contextReceivers: []
-        getter: KtPropertyGetterSymbol:
-          annotationsList: []
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          hasBody: false
-          hasStableParameterNames: true
-          isDefault: true
-          isExtension: false
-          isInline: false
-          isOverride: false
-          modality: FINAL
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/String
-          symbolKind: ACCESSOR
-          typeParameters: []
-          valueParameters: []
-          visibility: Public
-        hasBackingField: true
-        hasGetter: true
-        hasSetter: false
-        initializer: KtNonConstantInitializerValue(val value: String)
-        isConst: false
-        isDelegatedProperty: false
-        isExtension: false
-        isFromPrimaryConstructor: true
-        isLateInit: false
-        isOverride: false
-        isStatic: false
-        isVal: true
-        modality: FINAL
-        name: value
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/String
-        setter: null
-        symbolKind: CLASS_MEMBER
-        typeParameters: []
-        visibility: Public
+      generatedPrimaryConstructorProperty: KtKotlinPropertySymbol(/Style.value)
       hasDefaultValue: false
       isCrossinline: false
       isExtension: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.descriptors.txt
index 8df11187905..da1c01aa550 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.descriptors.txt
@@ -5,124 +5,7 @@ KtBackingFieldSymbol:
   isExtension: false
   name: field
   origin: PROPERTY_BACKING_FIELD
-  owningProperty: KtKotlinPropertySymbol:
-    annotationsList: [
-      PropertyAnnotation()
-        psi: KtAnnotationEntry
-    ]
-    callableIdIfNonLocal: /x
-    contextReceivers: []
-    getter: KtPropertyGetterSymbol:
-      annotationsList: [
-        GetAnnotation()
-          psi: KtAnnotationEntry
-        ExplicitGetAnnotation()
-          psi: KtAnnotationEntry
-      ]
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      hasBody: true
-      hasStableParameterNames: true
-      isDefault: false
-      isExtension: false
-      isInline: false
-      isOverride: false
-      modality: FINAL
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/Int
-      symbolKind: ACCESSOR
-      typeParameters: []
-      valueParameters: []
-      visibility: Public
-    hasBackingField: true
-    hasGetter: true
-    hasSetter: true
-    initializer: null
-    isConst: false
-    isDelegatedProperty: false
-    isExtension: false
-    isFromPrimaryConstructor: false
-    isLateInit: false
-    isOverride: false
-    isStatic: false
-    isVal: false
-    modality: FINAL
-    name: x
-    origin: SOURCE
-    receiverType: null
-    returnType: kotlin/Int
-    setter: KtPropertySetterSymbol:
-      annotationsList: [
-        SetAnnotation()
-          psi: KtAnnotationEntry
-        ExplicitSetAnnotation()
-          psi: KtAnnotationEntry
-      ]
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      hasBody: true
-      hasStableParameterNames: true
-      isDefault: false
-      isExtension: false
-      isInline: false
-      isOverride: false
-      modality: FINAL
-      origin: SOURCE
-      parameter: KtValueParameterSymbol:
-        annotationsList: [
-          ExplicitSetparamAnnotation()
-            psi: KtAnnotationEntry
-          SetparamAnnotation()
-            psi: KtAnnotationEntry
-        ]
-        callableIdIfNonLocal: null
-        contextReceivers: []
-        generatedPrimaryConstructorProperty: null
-        hasDefaultValue: false
-        isCrossinline: false
-        isExtension: false
-        isImplicitLambdaParameter: false
-        isNoinline: false
-        isVararg: false
-        name: value
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        symbolKind: LOCAL
-        typeParameters: []
-      receiverType: null
-      returnType: kotlin/Unit
-      symbolKind: ACCESSOR
-      typeParameters: []
-      valueParameters: [
-        KtValueParameterSymbol:
-          annotationsList: [
-            ExplicitSetparamAnnotation()
-              psi: KtAnnotationEntry
-            SetparamAnnotation()
-              psi: KtAnnotationEntry
-          ]
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          generatedPrimaryConstructorProperty: null
-          hasDefaultValue: false
-          isCrossinline: false
-          isExtension: false
-          isImplicitLambdaParameter: false
-          isNoinline: false
-          isVararg: false
-          name: value
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-      ]
-      visibility: Public
-    symbolKind: TOP_LEVEL
-    typeParameters: []
-    visibility: Public
+  owningProperty: KtKotlinPropertySymbol(/x)
   receiverType: null
   returnType: kotlin/Int
   symbolKind: LOCAL
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt
index 4e8bc2fc4ee..ff7ca838e81 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt
@@ -5,126 +5,7 @@ KtBackingFieldSymbol:
   isExtension: false
   name: field
   origin: PROPERTY_BACKING_FIELD
-  owningProperty: KtKotlinPropertySymbol:
-    annotationsList: [
-      PropertyAnnotation()
-        psi: KtAnnotationEntry
-      FieldAnnotation()
-        psi: KtAnnotationEntry
-    ]
-    callableIdIfNonLocal: /x
-    contextReceivers: []
-    getter: KtPropertyGetterSymbol:
-      annotationsList: [
-        ExplicitGetAnnotation()
-          psi: KtAnnotationEntry
-        GetAnnotation()
-          psi: KtAnnotationEntry
-      ]
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      hasBody: true
-      hasStableParameterNames: true
-      isDefault: false
-      isExtension: false
-      isInline: false
-      isOverride: false
-      modality: FINAL
-      origin: SOURCE
-      receiverType: null
-      returnType: kotlin/Int
-      symbolKind: ACCESSOR
-      typeParameters: []
-      valueParameters: []
-      visibility: Public
-    hasBackingField: true
-    hasGetter: true
-    hasSetter: true
-    initializer: KtConstantInitializerValue(0)
-    isConst: false
-    isDelegatedProperty: false
-    isExtension: false
-    isFromPrimaryConstructor: false
-    isLateInit: false
-    isOverride: false
-    isStatic: false
-    isVal: false
-    modality: FINAL
-    name: x
-    origin: SOURCE
-    receiverType: null
-    returnType: kotlin/Int
-    setter: KtPropertySetterSymbol:
-      annotationsList: [
-        ExplicitSetAnnotation()
-          psi: KtAnnotationEntry
-        SetAnnotation()
-          psi: KtAnnotationEntry
-      ]
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      hasBody: true
-      hasStableParameterNames: true
-      isDefault: false
-      isExtension: false
-      isInline: false
-      isOverride: false
-      modality: FINAL
-      origin: SOURCE
-      parameter: KtValueParameterSymbol:
-        annotationsList: [
-          ExplicitSetparamAnnotation()
-            psi: KtAnnotationEntry
-          SetparamAnnotation()
-            psi: KtAnnotationEntry
-        ]
-        callableIdIfNonLocal: null
-        contextReceivers: []
-        generatedPrimaryConstructorProperty: null
-        hasDefaultValue: false
-        isCrossinline: false
-        isExtension: false
-        isImplicitLambdaParameter: false
-        isNoinline: false
-        isVararg: false
-        name: value
-        origin: SOURCE
-        receiverType: null
-        returnType: kotlin/Int
-        symbolKind: LOCAL
-        typeParameters: []
-      receiverType: null
-      returnType: kotlin/Unit
-      symbolKind: ACCESSOR
-      typeParameters: []
-      valueParameters: [
-        KtValueParameterSymbol:
-          annotationsList: [
-            ExplicitSetparamAnnotation()
-              psi: KtAnnotationEntry
-            SetparamAnnotation()
-              psi: KtAnnotationEntry
-          ]
-          callableIdIfNonLocal: null
-          contextReceivers: []
-          generatedPrimaryConstructorProperty: null
-          hasDefaultValue: false
-          isCrossinline: false
-          isExtension: false
-          isImplicitLambdaParameter: false
-          isNoinline: false
-          isVararg: false
-          name: value
-          origin: SOURCE
-          receiverType: null
-          returnType: kotlin/Int
-          symbolKind: LOCAL
-          typeParameters: []
-      ]
-      visibility: Public
-    symbolKind: TOP_LEVEL
-    typeParameters: []
-    visibility: Public
+  owningProperty: KtKotlinPropertySymbol(/x)
   receiverType: null
   returnType: kotlin/Int
   symbolKind: LOCAL
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.pretty.txt
index 40e84341a38..c98dcb73283 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.pretty.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.pretty.txt
@@ -1,58 +1,6 @@
 KtReceiverParameterSymbol:
   origin: SOURCE
-  owningCallableSymbol: KtKotlinPropertySymbol:
-    annotationsList: []
-    callableIdIfNonLocal: /prop
-    contextReceivers: []
-    getter: KtPropertyGetterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      hasBody: true
-      hasStableParameterNames: true
-      isDefault: false
-      isExtension: false
-      isInline: false
-      isOverride: false
-      modality: FINAL
-      origin: SOURCE
-      receiverType: [
-        ReceiverAnnotation()
-          psi: KtAnnotationEntry
-        ReceiverTypeAnnotation()
-          psi: KtAnnotationEntry
-      ] @RECEIVER:R|ReceiverAnnotation|()  @R|ReceiverTypeAnnotation|()  kotlin/Long
-      returnType: kotlin/Boolean
-      symbolKind: ACCESSOR
-      typeParameters: []
-      valueParameters: []
-      visibility: Public
-    hasBackingField: false
-    hasGetter: true
-    hasSetter: false
-    initializer: null
-    isConst: false
-    isDelegatedProperty: false
-    isExtension: true
-    isFromPrimaryConstructor: false
-    isLateInit: false
-    isOverride: false
-    isStatic: false
-    isVal: true
-    modality: FINAL
-    name: prop
-    origin: SOURCE
-    receiverType: [
-      ReceiverAnnotation()
-        psi: KtAnnotationEntry
-      ReceiverTypeAnnotation()
-        psi: KtAnnotationEntry
-    ] @RECEIVER:R|ReceiverAnnotation|()  @R|ReceiverTypeAnnotation|()  kotlin/Long
-    returnType: kotlin/Boolean
-    setter: null
-    symbolKind: TOP_LEVEL
-    typeParameters: []
-    visibility: Public
+  owningCallableSymbol: KtKotlinPropertySymbol(/prop)
   type: [
     ReceiverAnnotation()
       psi: KtAnnotationEntry
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt
index f75b83b0fce..e9d7fe0bc90 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.txt
@@ -1,58 +1,6 @@
 KtReceiverParameterSymbol:
   origin: SOURCE
-  owningCallableSymbol: KtKotlinPropertySymbol:
-    annotationsList: []
-    callableIdIfNonLocal: /prop
-    contextReceivers: []
-    getter: KtPropertyGetterSymbol:
-      annotationsList: []
-      callableIdIfNonLocal: null
-      contextReceivers: []
-      hasBody: true
-      hasStableParameterNames: true
-      isDefault: false
-      isExtension: false
-      isInline: false
-      isOverride: false
-      modality: FINAL
-      origin: SOURCE
-      receiverType: [
-        ReceiverAnnotation()
-          psi: KtAnnotationEntry
-        ReceiverTypeAnnotation()
-          psi: KtAnnotationEntry
-      ] @RECEIVER:R|ReceiverAnnotation|()  @R|ReceiverTypeAnnotation|()  kotlin/Long
-      returnType: kotlin/Boolean
-      symbolKind: ACCESSOR
-      typeParameters: []
-      valueParameters: []
-      visibility: Public
-    hasBackingField: false
-    hasGetter: true
-    hasSetter: false
-    initializer: null
-    isConst: false
-    isDelegatedProperty: false
-    isExtension: true
-    isFromPrimaryConstructor: false
-    isLateInit: false
-    isOverride: false
-    isStatic: false
-    isVal: true
-    modality: FINAL
-    name: prop
-    origin: SOURCE
-    receiverType: [
-      ReceiverAnnotation()
-        psi: KtAnnotationEntry
-      ReceiverTypeAnnotation()
-        psi: KtAnnotationEntry
-    ] @RECEIVER:R|ReceiverAnnotation|()  @R|ReceiverTypeAnnotation|()  kotlin/Long
-    returnType: kotlin/Boolean
-    setter: null
-    symbolKind: TOP_LEVEL
-    typeParameters: []
-    visibility: Public
+  owningCallableSymbol: KtKotlinPropertySymbol(/prop)
   type: [
     ReceiverAnnotation()
       psi: KtAnnotationEntry