diff --git a/profiling_app/src/main/java/com/yerseg/profiler/MainActivity.java b/profiling_app/src/main/java/com/yerseg/profiler/MainActivity.java
index 4852c98..86907f0 100644
--- a/profiling_app/src/main/java/com/yerseg/profiler/MainActivity.java
+++ b/profiling_app/src/main/java/com/yerseg/profiler/MainActivity.java
@@ -16,8 +16,6 @@
 import android.os.Process;
 import android.provider.Settings;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
@@ -40,10 +38,9 @@ public class MainActivity extends FragmentActivity {
 
     private final static int PERMISSIONS_REQUEST_ID = 1001;
 
-    public static final String ACTION_LOCATION_SCANNING_SETTINGS = "android.settings.LOCATION_SCANNING_SETTINGS";
+    public final static String ACTION_LOCATION_SCANNING_SETTINGS = "android.settings.LOCATION_SCANNING_SETTINGS";
 
     private final static String LOCATION_SOURCE_SETTINGS_SHOWN = "com.yerseg.profiler.LOCATION_SOURCE_SETTINGS_SHOWN";
-    private final static String IGNORE_BATTERY_OPTIMIZATION_SETTINGS_SHOWN = "com.yerseg.profiler.IGNORE_BATTERY_OPTIMIZATION_SETTINGS_SHOWN";
     private final static String APPLICATION_DETAILS_SETTINGS_SHOWN = "com.yerseg.profiler.APPLICATION_DETAILS_SETTINGS_SHOWN";
     private final static String LOCATION_SCANNING_SETTINGS_SHOWN = "com.yerseg.profiler.LOCATION_SCANNING_SETTINGS_SHOWN";
     private final static String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS_SHOWN = "com.yerseg.profiler.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS_SHOWN";
@@ -191,20 +188,6 @@ private boolean isProfilingServiceRunning() {
         return isRunning;
     }
 
-    private boolean isUsageStatsPermissionsGranted() {
-        boolean granted = false;
-        AppOpsManager appOps = (AppOpsManager) getSystemService(APP_OPS_SERVICE);
-        int mode = appOps.checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS, android.os.Process.myUid(), getPackageName());
-
-        if (mode == AppOpsManager.MODE_DEFAULT) {
-            granted = (checkCallingOrSelfPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) == PackageManager.PERMISSION_GRANTED);
-        } else {
-            granted = (mode == AppOpsManager.MODE_ALLOWED);
-        }
-
-        return granted;
-    }
-
     void requestPermissions() {
         requestPermissions(new String[]{
                 Manifest.permission.ACCESS_COARSE_LOCATION,
diff --git a/profiling_app/src/main/java/com/yerseg/profiler/ProfilingService.java b/profiling_app/src/main/java/com/yerseg/profiler/ProfilingService.java
index f04d41e..8d83ef0 100644
--- a/profiling_app/src/main/java/com/yerseg/profiler/ProfilingService.java
+++ b/profiling_app/src/main/java/com/yerseg/profiler/ProfilingService.java
@@ -60,14 +60,12 @@ public class ProfilingService extends Service {
     public static final String PROFILING_STATS_DIRECTORY_NAME = "ProfilingData";
     public static final String PROFILING_STATS_TEMP_DIRECTORY_NAME = "ProfilingDataTemp";
 
-    public static final String APP_STATS_FILE_NAME = "app.data";
     public static final String BLUETOOTH_STATS_FILE_NAME = "bt.data";
     public static final String LOCATION_STATS_FILE_NAME = "location.data";
     public static final String WIFI_STATS_FILE_NAME = "wifi.data";
     public static final String BROADCASTS_STATS_FILE_NAME = "broadcasts.data";
 
     public static final String[] STAT_FILE_NAMES = {
-            APP_STATS_FILE_NAME,
             BLUETOOTH_STATS_FILE_NAME,
             LOCATION_STATS_FILE_NAME,
             WIFI_STATS_FILE_NAME,
@@ -124,12 +122,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
     @Override
     public void onDestroy() {
+        super.onDestroy();
+
         synchronized (this) {
             isStopping = true;
         }
 
         Log.d("Profiler [Service]", String.format(Locale.getDefault(), "\t%d\tonDestroy()", Process.myTid()));
-        super.onDestroy();
 
         stopLocationTracking();
         stopWifiTracking();
diff --git a/profiling_app/src/main/res/values/colors.xml b/profiling_app/src/main/res/values/colors.xml
index 2425a17..485f714 100644
--- a/profiling_app/src/main/res/values/colors.xml
+++ b/profiling_app/src/main/res/values/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
diff --git a/profiling_app/src/main/res/values/styles.xml b/profiling_app/src/main/res/values/styles.xml
index 691b9f3..b0858f6 100644
--- a/profiling_app/src/main/res/values/styles.xml
+++ b/profiling_app/src/main/res/values/styles.xml
@@ -7,13 +7,4 @@
         <item name="colorAccent">@color/safe_green</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
 </resources>
\ No newline at end of file
diff --git a/profiling_app/src/main/res/values/themes.xml b/profiling_app/src/main/res/values/themes.xml
index c92bfa0..216ecbd 100644
--- a/profiling_app/src/main/res/values/themes.xml
+++ b/profiling_app/src/main/res/values/themes.xml
@@ -19,7 +19,4 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="Theme.Profiler.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.Profiler.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file