diff --git a/topics/basics/architectural_overview/general_threading_rules.md b/topics/basics/architectural_overview/general_threading_rules.md
index d44ec4aa7..e72a3fe89 100644
--- a/topics/basics/architectural_overview/general_threading_rules.md
+++ b/topics/basics/architectural_overview/general_threading_rules.md
@@ -1,11 +1,10 @@
-[//]: # (title: General Threading Rules)
+# General Threading Rules
 
-<!-- Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 
 ## Read-Write Lock
 
 > [Thread Access Info](https://plugins.jetbrains.com/plugin/16815-thread-access-info) plugin visualizes Read/Write Access and Thread information in debugger.
->
 
 In general, code-related data structures in the IntelliJ Platform are covered by a single reader/writer lock.
 
@@ -83,7 +82,6 @@ If a process does lengthy non-PSI activity, insert explicit `checkCanceled()` ca
 
 > Throwing `ProcessCanceledException` from `checkCanceled()` can be disabled for development (e.g. while debugging the code) with the <ui-path>Tools | Internal Actions | Disable ProcessCanceledException</ui-path> action.
 > The action is available only if [Internal Mode is enabled](enabling_internal.md).
->
 
 ## Read Action Cancellability
 
diff --git a/topics/basics/architectural_overview/psi.md b/topics/basics/architectural_overview/psi.md
index 484e34882..231384b5f 100644
--- a/topics/basics/architectural_overview/psi.md
+++ b/topics/basics/architectural_overview/psi.md
@@ -1,6 +1,6 @@
-[//]: # (title: Program Structure Interface \(PSI\))
+# Program Structure Interface (PSI)
 
-<!-- Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 
 The Program Structure Interface, commonly referred to as just PSI, is the layer in the IntelliJ Platform responsible for parsing files and creating the syntactic and semantic code model that powers so many of the platform's features.
 
@@ -9,4 +9,3 @@ The Program Structure Interface, commonly referred to as just PSI, is the layer
 * [PSI Elements](psi_elements.md)
 
 > See [useful tools](explore_api.md#31-use-internal-mode-and-psiviewer) on how to inspect the PSI structure and its properties.
->
diff --git a/topics/basics/indexing_and_psi_stubs.md b/topics/basics/indexing_and_psi_stubs.md
index 4244356e9..bea325a90 100644
--- a/topics/basics/indexing_and_psi_stubs.md
+++ b/topics/basics/indexing_and_psi_stubs.md
@@ -1,6 +1,6 @@
-[//]: # (title: Indexing and PSI Stubs)
+# Indexing and PSI Stubs
 
-<!-- Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 
 ## Indexes
 
@@ -21,7 +21,6 @@ Querying a stub index gets you the set of matching PSI elements.
 Therefore, custom language plugin developers typically use stub indexes in their plugin implementations.
 
 > [Index Viewer](https://plugins.jetbrains.com/plugin/13029-index-viewer/) plugin can be used to inspect indexes' contents and properties.
->
 
 ## Dumb Mode
 
diff --git a/topics/products/dev_alternate_products.md b/topics/products/dev_alternate_products.md
index 9b5451e49..5d3428610 100644
--- a/topics/products/dev_alternate_products.md
+++ b/topics/products/dev_alternate_products.md
@@ -1,6 +1,6 @@
-[//]: # (title: Plugins Targeting IntelliJ Platform-Based IDEs)
+# Plugins Targeting IntelliJ Platform-Based IDEs
 
-<!-- Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 
 Plugin projects can target IDEs other than IntelliJ IDEA, as long as the products are based on the [IntelliJ Platform](intellij_platform.md).
 Such plugins are developed much like plugin projects that target IntelliJ IDEA.
diff --git a/topics/tutorials/custom_language_support/reference_contributor.md b/topics/tutorials/custom_language_support/reference_contributor.md
index 5045cafd3..0ff74e671 100644
--- a/topics/tutorials/custom_language_support/reference_contributor.md
+++ b/topics/tutorials/custom_language_support/reference_contributor.md
@@ -1,6 +1,6 @@
-[//]: # (title: 10. Reference Contributor)
+# 10. Reference Contributor
 
-<!-- Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 
 <tldr>