diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index cecd8495..6423c4f4 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -46,20 +46,15 @@
     <ID>LongParameterList:ServerRowAdapter.kt$ServerRowAdapter$( private var context: Context, private var data: Array&lt;ServerSetting&gt;, private val model: ServerSettingsModel, private val activeServerProvider: ActiveServerProvider, private val manageMode: Boolean, private val serverDeletedCallback: ((Int) -&gt; Unit), private val serverEditRequestedCallback: ((Int) -&gt; Unit) )</ID>
     <ID>MagicNumber:ActiveServerProvider.kt$ActiveServerProvider$8192</ID>
     <ID>MagicNumber:DownloadFile.kt$DownloadFile.DownloadTask$10</ID>
-    <ID>MagicNumber:DownloadFile.kt$DownloadFile.DownloadTask$1000L</ID>
     <ID>MagicNumber:DownloadFile.kt$DownloadFile.DownloadTask$60</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer$1000</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.&lt;no name provided&gt;$1000</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.&lt;no name provided&gt;$60000</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$100000</ID>
-    <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$1000L</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$1024L</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$8</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$86400L</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.BufferTask$8L</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.CheckCompletionTask$5000L</ID>
     <ID>MagicNumber:LocalMediaPlayer.kt$LocalMediaPlayer.PositionCache$50L</ID>
-    <ID>MagicNumber:MediaPlayerService.kt$MediaPlayerService$1000</ID>
     <ID>MagicNumber:MediaPlayerService.kt$MediaPlayerService$256</ID>
     <ID>MagicNumber:MediaPlayerService.kt$MediaPlayerService$3</ID>
     <ID>MagicNumber:MediaPlayerService.kt$MediaPlayerService$4</ID>
diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml
index c80cca17..c34a884d 100644
--- a/ultrasonic/lint-baseline.xml
+++ b/ultrasonic/lint-baseline.xml
@@ -26,45 +26,45 @@
     <issue
         id="DefaultLocale"
         message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="    String lhs = lhsArtist.getName().toLowerCase();"
-        errorLine2="                                     ~~~~~~~~~~~">
+        errorLine1="   String lhs = lhsArtist.getName().toLowerCase();"
+        errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="103"
-            column="38"/>
+            line="97"
+            column="37"/>
     </issue>
 
     <issue
         id="DefaultLocale"
         message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="    String rhs = rhsArtist.getName().toLowerCase();"
-        errorLine2="                                     ~~~~~~~~~~~">
+        errorLine1="   String rhs = rhsArtist.getName().toLowerCase();"
+        errorLine2="                                    ~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="104"
-            column="38"/>
+            line="98"
+            column="37"/>
     </issue>
 
     <issue
         id="DefaultLocale"
         message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="     int index = lhs.indexOf(String.format(&quot;%s &quot;, article.toLowerCase()));"
-        errorLine2="                                                          ~~~~~~~~~~~">
+        errorLine1="    int index = lhs.indexOf(String.format(&quot;%s &quot;, article.toLowerCase()));"
+        errorLine2="                                                         ~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="121"
-            column="59"/>
+            line="115"
+            column="58"/>
     </issue>
 
     <issue
         id="DefaultLocale"
         message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="     index = rhs.indexOf(String.format(&quot;%s &quot;, article.toLowerCase()));"
-        errorLine2="                                                      ~~~~~~~~~~~">
+        errorLine1="    index = rhs.indexOf(String.format(&quot;%s &quot;, article.toLowerCase()));"
+        errorLine2="                                                     ~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="128"
-            column="55"/>
+            line="122"
+            column="54"/>
     </issue>
 
     <issue
@@ -74,7 +74,7 @@
         errorLine2="                                     ~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="486"
+            line="466"
             column="38"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                          ~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="488"
+            line="468"
             column="43"/>
     </issue>
 
@@ -238,7 +238,7 @@
         errorLine2="                                                         ~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/JukeboxMediaPlayer.java"
-            line="483"
+            line="476"
             column="58"/>
     </issue>
 
@@ -491,7 +491,7 @@
         errorLine2="                                    ~~~~~~~~~~~~">
         <location
             file="src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java"
-            line="653"
+            line="633"
             column="37"/>
     </issue>
 
@@ -579,39 +579,6 @@
             file="src/main/res/drawable-xhdpi-v14"/>
     </issue>
 
-    <issue
-        id="StaticFieldLeak"
-        message="This `AsyncTask` class should be static or leaks might occur (org.moire.ultrasonic.util.CacheCleaner.BackgroundCleanup)"
-        errorLine1=" private class BackgroundCleanup extends AsyncTask&lt;Void, Void, Void>"
-        errorLine2="               ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/util/CacheCleaner.java"
-            line="225"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="StaticFieldLeak"
-        message="This `AsyncTask` class should be static or leaks might occur (org.moire.ultrasonic.util.CacheCleaner.BackgroundSpaceCleanup)"
-        errorLine1=" private class BackgroundSpaceCleanup extends AsyncTask&lt;Void, Void, Void>"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/util/CacheCleaner.java"
-            line="253"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="StaticFieldLeak"
-        message="This `AsyncTask` class should be static or leaks might occur (org.moire.ultrasonic.util.CacheCleaner.BackgroundPlaylistsCleanup)"
-        errorLine1=" private class BackgroundPlaylistsCleanup extends AsyncTask&lt;List&lt;Playlist>, Void, Void>"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/moire/ultrasonic/util/CacheCleaner.java"
-            line="282"
-            column="16"/>
-    </issue>
-
     <issue
         id="StaticFieldLeak"
         message="This `AsyncTask` class should be static or leaks might occur (org.moire.ultrasonic.service.DownloadQueueSerializer.SerializeTask)"
@@ -2117,13 +2084,6 @@
             file="src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png"/>
     </issue>
 
-    <issue
-        id="IconMissingDensityFolder"
-        message="Missing density variation folders in `/home/xyz/08-Tech/02-Android/ultrasonic/ultrasonic/src/main/res`: drawable-mdpi, drawable-xhdpi, drawable-xxhdpi">
-        <location
-            file="src/main/res"/>
-    </issue>
-
     <issue
         id="Autofill"
         message="Missing `autofillHints` attribute"