diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 1c7b29ba4..00cdf9736 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -32,22 +32,20 @@ import java.io.File
 import java.util.*
 
 class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
-    companion object {
-        private val STORAGE_PERMISSION = 1
-        private val PICK_MEDIA = 2
-        private val PICK_WALLPAPER = 3
+    private val STORAGE_PERMISSION = 1
+    private val PICK_MEDIA = 2
+    private val PICK_WALLPAPER = 3
 
-        lateinit var mDirs: ArrayList<Directory>
+    lateinit var mDirs: ArrayList<Directory>
 
-        private var mIsPickImageIntent = false
-        private var mIsPickVideoIntent = false
-        private var mIsGetImageContentIntent = false
-        private var mIsGetVideoContentIntent = false
-        private var mIsGetAnyContentIntent = false
-        private var mIsSetWallpaperIntent = false
-        private var mIsThirdPartyIntent = false
-        private var mIsGettingDirs = false
-    }
+    private var mIsPickImageIntent = false
+    private var mIsPickVideoIntent = false
+    private var mIsGetImageContentIntent = false
+    private var mIsGetVideoContentIntent = false
+    private var mIsGetAnyContentIntent = false
+    private var mIsSetWallpaperIntent = false
+    private var mIsThirdPartyIntent = false
+    private var mIsGettingDirs = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 005070fbb..069523b56 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -28,18 +28,16 @@ import java.io.IOException
 import java.util.*
 
 class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
-    companion object {
-        private val TAG = MediaActivity::class.java.simpleName
+    private val TAG = MediaActivity::class.java.simpleName
 
-        private var mMedia = ArrayList<Medium>()
+    private var mMedia = ArrayList<Medium>()
 
-        private var mPath = ""
-        private var mIsGetImageIntent = false
-        private var mIsGetVideoIntent = false
-        private var mIsGetAnyIntent = false
-        private var mIsGettingMedia = false
-        private var mShowAll = false
-    }
+    private var mPath = ""
+    private var mIsGetImageIntent = false
+    private var mIsGetVideoIntent = false
+    private var mIsGetAnyIntent = false
+    private var mIsGettingMedia = false
+    private var mShowAll = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)