diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 0ab5ea61ec..0000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[*.{kt,kts}]
-
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
-
-ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
-ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.**
-
-max_line_length = 120
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1ef5db9fa5..72bf0529fb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -9,7 +9,8 @@
           <package name="io.ktor" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="ALLOW_TRAILING_COMMA" value="true" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="5" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="3" />
       <option name="BLANK_LINES_BEFORE_DECLARATION_WITH_COMMENT_OR_ANNOTATION_ON_SEPARATE_LINE" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
@@ -17,6 +18,9 @@
       <option name="SPACES_AROUND_KEY_VALUE_DELIMITER" value="true" />
       <option name="KEEP_BLANK_LINES" value="true" />
     </Properties>
+    <editorconfig>
+      <option name="ENABLED" value="false" />
+    </editorconfig>
     <codeStyleSettings language="CMake">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -176,9 +180,6 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="EXTENDS_LIST_WRAP" value="5" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
-      <option name="ASSIGNMENT_WRAP" value="5" />
       <option name="PARAMETER_ANNOTATION_WRAP" value="5" />
       <option name="VARIABLE_ANNOTATION_WRAP" value="5" />
       <option name="ENUM_CONSTANTS_WRAP" value="5" />