diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 29a72d9dc7..36c8ffb009 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -91,7 +91,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d8b..0000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
index 5612f5318e..5b57f23f17 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
@@ -482,15 +482,4 @@ class BaseDrawer {
 
         return new double[]{lon, lat};
     }
-
-    protected String getDataTypes(int fromType) {
-        switch (fromType) {
-            case FROM_MY_LOCATION:
-                return TYPE_MARKER_CLOUD_DATA;
-            case FROM_ADAS:
-                return TYPE_MARKER_ADAS;
-            default:
-                return TYPE_MARKER_CLOUD_DATA;
-        }
-    }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
index d09f04049a..b0c87d8ec1 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -1,5 +1,7 @@
 package com.mogo.module.common.drawer;
 
+import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_DATA;
+
 import android.os.Build;
 import android.os.Message;
 import android.text.TextUtils;
@@ -411,7 +413,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
         }
 
         MogoMarkerOptions options = new MogoMarkerOptions()
-                .owner(getDataTypes(data.getFromType()))
+                .owner(TYPE_MARKER_CLOUD_DATA)
                 .anchor(0.5f, 0.5f)
                 .rotate((float) data.getHeading())
                 .object(data)
@@ -432,7 +434,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
             options.icon(view);
             resIdVal = view.getId() + "";
         }
-        IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(getDataTypes(data.getFromType()), options);
+        IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(TYPE_MARKER_CLOUD_DATA, options);
         cacheMarkerIconResMd5Val(resIdVal, marker);
 
         if (!TextUtils.isEmpty(data.getSn())) {