diff --git a/.gitignore b/.gitignore
index 333a4c41d..c25d06b3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,12 +9,14 @@
 .idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/**/libraries/
+.idea/**/shelf
 .idea/caches
 .idea/modules.xml
 .idea/navEditor.xml
 .idea/encodings.xml
 .idea/compiler.xml
 .idea/jarRepositories.xml
+.idea/androidTestResultsUserPreferences.xml
 
 ###Android###
 
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7928f60d5..1e0cc37b9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -46,9 +46,6 @@
       </option>
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
       <option name="PACKAGES_IMPORT_LAYOUT">
         <value>
           <package name="android" alias="false" withSubpackages="true" />
@@ -63,16 +60,11 @@
         </value>
       </option>
       <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="999" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="999" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <Properties>
       <option name="KEEP_BLANK_LINES" value="true" />
     </Properties>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <codeStyleSettings language="Groovy">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 82c2e2f0b..79ee123c2 100755
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Project" />
   </state>
 </component>
\ No newline at end of file