diff --git a/playlists/playlist.m3u b/playlists/playlist.m3u
index b44e3ef..75cc612 100644
--- a/playlists/playlist.m3u
+++ b/playlists/playlist.m3u
@@ -3,9 +3,6 @@
 #EXTINF:-1,Aito Iskelmä
 https://digitacdn.akamaized.net/hls/live/629243/aitoiskelma/master-128000.m3u8
 
-#EXTINF:-1,Basso
-https://stream.bauermedia.fi/basso/bassoradio_64.aac
-
 #EXTINF:-1,GrooveFM
 http://digitacdn.akamaized.net/hls/live/629243/groove/master-128000.m3u8
 
@@ -18,12 +15,6 @@ https://digitacdn.akamaized.net/hls/live/629243/hitmix/master-128000.m3u8
 #EXTINF:-1,Iskelmä Rauma
 https://stream.bauermedia.fi/iskelma/rma_64.aac
 
-#EXTINF:-1,Kasari
-https://stream.bauermedia.fi/kasari/kasari_64.aac
-
-#EXTINF:-1,Kiss
-https://stream.bauermedia.fi/kiss/kiss_64.aac
-
 #EXTINF:-1,Loop
 https://digitacdn.akamaized.net/hls/live/629243/loop/master-128000.m3u8
 
@@ -33,9 +24,6 @@ https://digitacdn.akamaized.net/hls/live/629243/radioaalto/master-128000.m3u8
 #EXTINF:-1,NRJ Finland
 https://stream.bauermedia.fi/nrj/nrj_64.aac
 
-#EXTINF:-1,Radio 957
-http://stream.bauermedia.fi/radio957/radio957_64.aac
-
 #EXTINF:-1,Radio City
 https://stream.bauermedia.fi/radiocity/radiocity_64.aac
 
@@ -48,9 +36,6 @@ https://stream.bauermedia.fi/radionova/radionova_64.aac
 #EXTINF:-1,Radio Pooki
 http://stream.bauermedia.fi/radiopooki/radiopooki_64.aac
 
-#EXTINF:-1,Radio Pori
-https://stream.bauermedia.fi/radiopori/radiopori_64.aac
-
 #EXTINF:-1,Radio Ramona
 https://stream.protonbroadcast.com:8443/ramona.mp3
 
@@ -63,17 +48,8 @@ https://st.downtime.fi/sun.mp3
 #EXTINF:-1,Radio Suomipop
 https://digitacdn.akamaized.net/hls/live/629243/radiosuomipop/master-128000.m3u8
 
-#EXTINF:-1,SuomiRock
-https://stream.bauermedia.fi/suomirock/suomirock_64.aac
-
-#EXTINF:-1,SuomiRäp
-https://stream.bauermedia.fi/basso/rap_64.aac
-
 #EXTINF:-1,Yle Radio Suomi
 https://icecast.live.yle.fi/radio/YlePori/icecast.audio
 
 #EXTINF:-1,YleX
-https://icecast.live.yle.fi/radio/YleX/icecast.audio
-
-#EXTINF:-1,Ysäri
-https://stream.bauermedia.fi/ysari/ysari_64.aac
\ No newline at end of file
+https://icecast.live.yle.fi/radio/YleX/icecast.audio
\ No newline at end of file
diff --git a/playlists/playlist.pls b/playlists/playlist.pls
index 0bac738..372c862 100644
--- a/playlists/playlist.pls
+++ b/playlists/playlist.pls
@@ -3,79 +3,55 @@
 File1=https://digitacdn.akamaized.net/hls/live/629243/aitoiskelma/master-128000.m3u8
 Title1=Aito Iskelmä
 
-File2=https://stream.bauermedia.fi/basso/bassoradio_64.aac
-Title2=Basso
+File2=http://digitacdn.akamaized.net/hls/live/629243/groove/master-128000.m3u8
+Title2=GrooveFM
 
-File3=http://digitacdn.akamaized.net/hls/live/629243/groove/master-128000.m3u8
-Title3=GrooveFM
+File3=https://digitacdn.akamaized.net/hls/live/629243/radiohelmi/master-128000.m3u8
+Title3=Helmiradio
 
-File4=https://digitacdn.akamaized.net/hls/live/629243/radiohelmi/master-128000.m3u8
-Title4=Helmiradio
+File4=https://digitacdn.akamaized.net/hls/live/629243/hitmix/master-128000.m3u8
+Title4=HitMix
 
-File5=https://digitacdn.akamaized.net/hls/live/629243/hitmix/master-128000.m3u8
-Title5=HitMix
+File5=https://stream.bauermedia.fi/iskelma/rma_64.aac
+Title5=Iskelmä Rauma
 
-File6=https://stream.bauermedia.fi/iskelma/rma_64.aac
-Title6=Iskelmä Rauma
+File6=https://digitacdn.akamaized.net/hls/live/629243/loop/master-128000.m3u8
+Title6=Loop
 
-File7=https://stream.bauermedia.fi/kasari/kasari_64.aac
-Title7=Kasari
+File7=https://digitacdn.akamaized.net/hls/live/629243/radioaalto/master-128000.m3u8
+Title7=Me Naiset Radio
 
-File8=https://stream.bauermedia.fi/kiss/kiss_64.aac
-Title8=Kiss
+File8=https://stream.bauermedia.fi/nrj/nrj_64.aac
+Title8=NRJ Finland
 
-File9=https://digitacdn.akamaized.net/hls/live/629243/loop/master-128000.m3u8
-Title9=Loop
+File9=https://stream.bauermedia.fi/radiocity/radiocity_64.aac
+Title9=Radio City
 
-File10=https://digitacdn.akamaized.net/hls/live/629243/radioaalto/master-128000.m3u8
-Title10=Me Naiset Radio
+File10=http://stream.bauermedia.fi/nostalgia/nostalgia_64.aac
+Title10=Radio Nostalgia
 
-File11=https://stream.bauermedia.fi/nrj/nrj_64.aac
-Title11=NRJ Finland
+File11=https://stream.bauermedia.fi/radionova/radionova_64.aac
+Title11=Radio Nova
 
-File12=http://stream.bauermedia.fi/radio957/radio957_64.aac
-Title12=Radio 957
+File12=http://stream.bauermedia.fi/radiopooki/radiopooki_64.aac
+Title12=Radio Pooki
 
-File13=https://stream.bauermedia.fi/radiocity/radiocity_64.aac
-Title13=Radio City
+File13=https://stream.protonbroadcast.com:8443/ramona.mp3
+Title13=Radio Ramona
 
-File14=http://stream.bauermedia.fi/nostalgia/nostalgia_64.aac
-Title14=Radio Nostalgia
+File14=https://digitacdn.akamaized.net/hls/live/629243/radiorock/master-128000.m3u8
+Title14=Radio Rock
 
-File15=https://stream.bauermedia.fi/radionova/radionova_64.aac
-Title15=Radio Nova
+File15=https://st.downtime.fi/sun.mp3
+Title15=Radio SUN
 
-File16=http://stream.bauermedia.fi/radiopooki/radiopooki_64.aac
-Title16=Radio Pooki
+File16=https://digitacdn.akamaized.net/hls/live/629243/radiosuomipop/master-128000.m3u8
+Title16=Radio Suomipop
 
-File17=https://stream.bauermedia.fi/radiopori/radiopori_64.aac
-Title17=Radio Pori
+File17=https://icecast.live.yle.fi/radio/YlePori/icecast.audio
+Title17=Yle Radio Suomi
 
-File18=https://stream.protonbroadcast.com:8443/ramona.mp3
-Title18=Radio Ramona
-
-File19=https://digitacdn.akamaized.net/hls/live/629243/radiorock/master-128000.m3u8
-Title19=Radio Rock
-
-File20=https://st.downtime.fi/sun.mp3
-Title20=Radio SUN
-
-File21=https://digitacdn.akamaized.net/hls/live/629243/radiosuomipop/master-128000.m3u8
-Title21=Radio Suomipop
-
-File22=https://stream.bauermedia.fi/suomirock/suomirock_64.aac
-Title22=SuomiRock
-
-File23=https://stream.bauermedia.fi/basso/rap_64.aac
-Title23=SuomiRäp
-
-File24=https://icecast.live.yle.fi/radio/YlePori/icecast.audio
-Title24=Yle Radio Suomi
-
-File25=https://icecast.live.yle.fi/radio/YleX/icecast.audio
-Title25=YleX
-
-File26=https://stream.bauermedia.fi/ysari/ysari_64.aac
-Title26=Ysäri
+File18=https://icecast.live.yle.fi/radio/YleX/icecast.audio
+Title18=YleX
 
 Version=2
\ No newline at end of file
diff --git a/playlists/playlist.xspf b/playlists/playlist.xspf
index 0daccec..665b98c 100644
--- a/playlists/playlist.xspf
+++ b/playlists/playlist.xspf
@@ -5,10 +5,6 @@
        <title>Aito Iskelmä</title>
        <location>https://digitacdn.akamaized.net/hls/live/629243/aitoiskelma/master-128000.m3u8</location>
    </track>
-   <track>
-       <title>Basso</title>
-       <location>https://stream.bauermedia.fi/basso/bassoradio_64.aac</location>
-   </track>
    <track>
        <title>GrooveFM</title>
        <location>http://digitacdn.akamaized.net/hls/live/629243/groove/master-128000.m3u8</location>
@@ -25,14 +21,6 @@
        <title>Iskelmä Rauma</title>
        <location>https://stream.bauermedia.fi/iskelma/rma_64.aac</location>
    </track>
-   <track>
-       <title>Kasari</title>
-       <location>https://stream.bauermedia.fi/kasari/kasari_64.aac</location>
-   </track>
-   <track>
-       <title>Kiss</title>
-       <location>https://stream.bauermedia.fi/kiss/kiss_64.aac</location>
-   </track>
    <track>
        <title>Loop</title>
        <location>https://digitacdn.akamaized.net/hls/live/629243/loop/master-128000.m3u8</location>
@@ -45,10 +33,6 @@
        <title>NRJ Finland</title>
        <location>https://stream.bauermedia.fi/nrj/nrj_64.aac</location>
    </track>
-   <track>
-       <title>Radio 957</title>
-       <location>http://stream.bauermedia.fi/radio957/radio957_64.aac</location>
-   </track>
    <track>
        <title>Radio City</title>
        <location>https://stream.bauermedia.fi/radiocity/radiocity_64.aac</location>
@@ -65,10 +49,6 @@
        <title>Radio Pooki</title>
        <location>http://stream.bauermedia.fi/radiopooki/radiopooki_64.aac</location>
    </track>
-   <track>
-       <title>Radio Pori</title>
-       <location>https://stream.bauermedia.fi/radiopori/radiopori_64.aac</location>
-   </track>
    <track>
        <title>Radio Ramona</title>
        <location>https://stream.protonbroadcast.com:8443/ramona.mp3</location>
@@ -85,14 +65,6 @@
        <title>Radio Suomipop</title>
        <location>https://digitacdn.akamaized.net/hls/live/629243/radiosuomipop/master-128000.m3u8</location>
    </track>
-   <track>
-       <title>SuomiRock</title>
-       <location>https://stream.bauermedia.fi/suomirock/suomirock_64.aac</location>
-   </track>
-   <track>
-       <title>SuomiRäp</title>
-       <location>https://stream.bauermedia.fi/basso/rap_64.aac</location>
-   </track>
    <track>
        <title>Yle Radio Suomi</title>
        <location>https://icecast.live.yle.fi/radio/YlePori/icecast.audio</location>
@@ -101,9 +73,5 @@
        <title>YleX</title>
        <location>https://icecast.live.yle.fi/radio/YleX/icecast.audio</location>
    </track>
-   <track>
-       <title>Ysäri</title>
-       <location>https://stream.bauermedia.fi/ysari/ysari_64.aac</location>
-   </track>
 </trackList>
 </playlist>
\ No newline at end of file