Index: channels/links.py
==================================================================
--- channels/links.py
+++ channels/links.py
@@ -2,11 +2,11 @@
 # api: streamtuner2
 # title: Links to directory services
 # description: Static list of various music directory websites.
 # type: group
 # category: web
-# version: 0.3
+# version: 0.4
 # priority: standard
 # config: -
 #
 # Simply adds a "links" entry in bookmarks tab, where known services
 # are listed with homepage links. Registered plugins automatically
@@ -25,17 +25,15 @@
 class links (FeaturePlugin):
 
     # list
     streams = [    ]
     default = [
-        ("stream", "rad.io", "http://www.rad.io/"),
         ("stream", "RadioTower", "http://www.radiotower.com/"),
         ("stream", "8tracks", "http://8tracks.com/"),
         ("stream", "Jango", "http://www.jango.com/"),
         ("stream", "last.fm", "http://www.last.fm/"),
         ("stream", "StreamFinder", "http://www.streamfinder.com/"),
-        ("stream", "RadioTower", "http://radiotower.com/"),
         ("stream", "Rhapsody (US-only)", "http://www.rhapsody.com/"),
         ("stream", "Pirateradio Network", "http://www.pirateradionetwork.com/"),
         ("stream", "radio-locator", "http://www.radio-locator.com/"),
         ("stream", "Radio Station World", "http://radiostationworld.com/"),
         ("stream", "iHeart", "http://www.iheartradio.com/"),
@@ -42,15 +40,12 @@
         ("download", "Live Music Archive(.org)", "https://archive.org/details/etree"),
         ("download", "FMA, free music archive", "http://freemusicarchive.org/"),
         ("download", "Audiofarm", "http://audiofarm.org/"),
         ("stream", "SoundCloud", "https://soundcloud.com/"),
         ("download", "ccMixter", "http://dig.ccmixter.org/"),
-        ("download", "mySpoonful", "http://myspoonful.com/"),
-        ("download", "NoiseTrade", "http://noisetrade.com/"),
         ("stream", "Hype Machine", "http://hypem.com/"),
         ("download", "Amazon Free MP3s", "http://www.amazon.com/b/ref=dm_hp_bb_atw?node=7933257011"),
-        ("stream", "Shuffler.fm", "http://shuffler.fm/"),
         ("download", "ccTrax", "http://www.cctrax.com/"),
         ("list", "WP: Streaming music services", "http://en.wikipedia.org/wiki/Comparison_of_on-demand_streaming_music_services"),
         ("list", "WP: Music databases", "http://en.wikipedia.org/wiki/List_of_online_music_databases"),
         ("commercial", "Google Play Music", "https://play.google.com/about/music/"),
         ("commercial", "Deezer", "http://www.deezer.com/features/music.html"),
@@ -70,10 +65,11 @@
         self.bookmarks.add_category(self.module, self)
 
 
     def update_streams(self, cat="links"):
         #log.PROC("links.update_streams")
+        del self.streams[:]
     
         # Collect links from channel plugins
         for name,channel in self.parent.channels.items():
             try:
                 self.streams.append({
@@ -98,13 +94,10 @@
             })
 
         # add to bookmarks
         return self.streams
 
-        # redraw category
-#        parent.bookmarks.reload_if_current(self.module)
-
 
     # retrieve links from repository wiki page (via JSON API /json/wiki/get/…)
     def from_wiki(self):
         src = ahttp.get("https://fossil.include-once.org/streamtuner2/json/wiki/get/links", timeout=2)
         if not src: