diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/LoadImageTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/LoadImageTask.java
index 13d788d51..7eb740954 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/LoadImageTask.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/LoadImageTask.java
@@ -57,7 +57,7 @@ public class LoadImageTask extends AsyncTask<ImageSource, Void, Void> {
         }
         return null;
     }
-    
+
     private boolean noImages() {
         return !NetworkState.isWifi() && PreferenceActivity.getBoolean(imageView.getContext(), PreferenceActivity.PREFERENCE_NO_IMAGES);
     }
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java
index e651afdf4..83e58f092 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java
@@ -6,7 +6,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.github.yeriomin.yalpstore.model.App;
 
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportBuilder.java
index d5a7c7db2..12c856641 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportBuilder.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportBuilder.java
@@ -1,12 +1,8 @@
 package com.github.yeriomin.yalpstore.bugreport;
 
 import android.content.Context;
-import android.net.Uri;
-import android.os.Build;
 import android.util.Log;
 
-import com.github.yeriomin.yalpstore.BuildConfig;
-import com.github.yeriomin.yalpstore.FileProvider;
 import com.github.yeriomin.yalpstore.Util;
 
 import java.io.BufferedWriter;
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportDeviceInfoBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportDeviceInfoBuilder.java
index 1337d4b01..2f9733103 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportDeviceInfoBuilder.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportDeviceInfoBuilder.java
@@ -11,7 +11,6 @@ import android.util.DisplayMetrics;
 
 import com.github.yeriomin.yalpstore.EglExtensionRetriever;
 import com.github.yeriomin.yalpstore.NativeDeviceInfoProvider;
-import com.github.yeriomin.yalpstore.bugreport.BugReportBuilder;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportLogBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportLogBuilder.java
index 13790f795..823d6d312 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportLogBuilder.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportLogBuilder.java
@@ -2,8 +2,6 @@ package com.github.yeriomin.yalpstore.bugreport;
 
 import android.content.Context;
 
-import com.github.yeriomin.yalpstore.bugreport.BugReportBuilder;
-
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportPreferencesBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportPreferencesBuilder.java
index d97a7b5b1..eaddc7151 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportPreferencesBuilder.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportPreferencesBuilder.java
@@ -1,7 +1,6 @@
 package com.github.yeriomin.yalpstore.bugreport;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import com.github.yeriomin.yalpstore.PreferenceActivity;
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportSender.java b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportSender.java
index 774ede294..cccecbf97 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportSender.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/bugreport/BugReportSender.java
@@ -3,7 +3,6 @@ package com.github.yeriomin.yalpstore.bugreport;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.Toast;
 
 import java.io.File;
 import java.util.ArrayList;