diff --git a/astronaut/astrohelp b/astronaut/astrohelp
index dd1eb16..6fa049d 100755
--- a/astronaut/astrohelp
+++ b/astronaut/astrohelp
@@ -4,7 +4,10 @@ set -eu
 # Helper functions for programs that work with satellite files.
 
 show_help() {
-echo "Script with helper functions for working with satellite files.
+echo "!! THIS PROGRAM HAS BEEN DEPRECATED !!
+This was a hack at best, and since freshnaut has been deprecated, it won't be needed anymore.
+
+Script with helper functions for working with satellite files.
 Usage: $0 <satellite file> <function> [arguments]
 
 Functions:
diff --git a/astronaut/freshnaut b/astronaut/freshnaut
index 318e158..b4ed9f8 100755
--- a/astronaut/freshnaut
+++ b/astronaut/freshnaut
@@ -1,7 +1,10 @@
 #!/usr/bin/env lua
 
 function show_help()
-print(string.format([[This program will help you keep your satellites fresh and up to date.
+print(string.format([[!! THIS PROGRAM HAS BEEN DEPRECATED !!
+Consider rolling your own update checks that aren't as hacky.
+
+This program will help you keep your satellites fresh and up to date.
 Usage: %s <sat|dir> <check> <save>
 
 sat = Check only one satellite
diff --git a/satellites/ant.sat b/satellites/ant.sat
index f3aa117..11a0588 100644
--- a/satellites/ant.sat
+++ b/satellites/ant.sat
@@ -1,6 +1,5 @@
 name=apache-ant
 version=1.10.1
-update_url='https://www.apache.org/dist/ant/source/'
 
 dlextract "https://www.apache.org/dist/ant/source/$name-$version-src.tar.xz" \
           'ebecbe7488c624b06bc6a264a3a7c4ec'
diff --git a/satellites/cabextract.sat b/satellites/cabextract.sat
index bd45f40..aa328c4 100644
--- a/satellites/cabextract.sat
+++ b/satellites/cabextract.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=cabextract
 version=1.6
-update_url='https://www.cabextract.org.uk/'
 
 dlextract "https://www.cabextract.org.uk/$name-$version.tar.gz" \
           'ee3ded0b1f84e5c6e3309bb36d701916'
diff --git a/satellites/confuse.sat b/satellites/confuse.sat
index f8a8371..076a177 100644
--- a/satellites/confuse.sat
+++ b/satellites/confuse.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=confuse
 version=3.2
-update_url="https://github.com/martinh/lib$name/releases"
 
 dlextract "https://github.com/martinh/lib$name/releases/download/v$version/$name-$version.tar.xz" \
           '84259ac3bd495645ab2fe61654917232'
diff --git a/satellites/create_ap.sat b/satellites/create_ap.sat
index bd61f5c..3453c56 100644
--- a/satellites/create_ap.sat
+++ b/satellites/create_ap.sat
@@ -1,7 +1,5 @@
 name=create_ap
 version=0.4.6
-update_url="https://github.com/oblique/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/oblique/$name/archive/v$version/$name-$version.tar.gz" \
           '4eaa1200204542670458cc7e9411b651'
diff --git a/satellites/devkitarm-general-tools.sat b/satellites/devkitarm-general-tools.sat
index 33ff2a1..9b86e4e 100644
--- a/satellites/devkitarm-general-tools.sat
+++ b/satellites/devkitarm-general-tools.sat
@@ -1,6 +1,5 @@
 name=general-tools
 version=1.0.0
-update_url='https://sourceforge.net/projects/devkitpro/files/sources/tools/'
 
 dlextract "https://sourceforge.net/projects/devkitpro/files/sources/tools/$name-$version.tar.bz2" \
           'ad13e4e3521e49156340c57ecb3c1b76'
diff --git a/satellites/devkitarm-libctru.sat b/satellites/devkitarm-libctru.sat
index 6244164..41ac70b 100644
--- a/satellites/devkitarm-libctru.sat
+++ b/satellites/devkitarm-libctru.sat
@@ -1,6 +1,5 @@
 name=libctru
 version=1.4.0
-update_url="https://github.com/smealum/ctrulib/releases"
 
 dlextract "https://github.com/smealum/ctrulib/releases/download/v$version/$name-src-$version.tar.bz2" \
           '460645e1985bd2c47b02a1a24e712241'
diff --git a/satellites/devkitarm.sat b/satellites/devkitarm.sat
index 10c94f8..e2bb88e 100644
--- a/satellites/devkitarm.sat
+++ b/satellites/devkitarm.sat
@@ -4,7 +4,6 @@ version_gcc=7.1.0
 version_binutils=2.28
 version_newlib=2.5.0
 version_gdb=8.0
-update_url="https://sourceforge.net/projects/devkitpro/files/buildscripts/"
 
 dlextract "https://sourceforge.net/projects/devkitpro/files/buildscripts/buildscripts-$version.tar.bz2" \
           'b82b844ce1c59e859ee00285bb85451f'
diff --git a/satellites/docker.sat b/satellites/docker.sat
index 9c40193..d6373f3 100644
--- a/satellites/docker.sat
+++ b/satellites/docker.sat
@@ -13,8 +13,6 @@ version_runc=3f2f8b84a77f73d38244dd690525642a72156c64
 version_containerd=06b9cb35161009dcb7123345749fef02f7cea8e0
 version_tini=949e6facb77383876aeff8a6944dde66b3089574
 version_libnetwork=7b2b1feb1de4817d522cc372af149ff48d25028e
-update_url="https://github.com/$name/$name-ce/releases"
-update_names="/archive/v$version.tar.gz"
 
 # Go doesn't like being stripped
 options="!strip,$options"
diff --git a/satellites/dolphin-emu.sat b/satellites/dolphin-emu.sat
index 482074c..e307ea1 100644
--- a/satellites/dolphin-emu.sat
+++ b/satellites/dolphin-emu.sat
@@ -4,8 +4,6 @@ import 'compile/cmake'
 
 name=dolphin-emu
 version=5.0
-update_url="https://github.com/$name/dolphin/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/$name/dolphin/archive/$version/dolphin-$version.tar.gz" \
           'ed94272956adbec690808f6e4d8ff065'
diff --git a/satellites/dunst.sat b/satellites/dunst.sat
index 30b1d64..d9570fa 100644
--- a/satellites/dunst.sat
+++ b/satellites/dunst.sat
@@ -1,7 +1,5 @@
 name=dunst
 version=1.2.0
-update_url="https://github.com/dunst-project/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 define_option '!patch: Apply some custom patches'
 
diff --git a/satellites/feh.sat b/satellites/feh.sat
index 3d559bc..4aec6e1 100644
--- a/satellites/feh.sat
+++ b/satellites/feh.sat
@@ -1,6 +1,5 @@
 name=feh
 version=2.19
-update_url='https://feh.finalrewind.org/'
 
 dlextract "https://feh.finalrewind.org/$name-$version.tar.bz2" \
           '54fc20a0f35f0e2fea24541e622ae1d7'
diff --git a/satellites/ffmpeg.sat b/satellites/ffmpeg.sat
index f57b4c3..d797c7c 100644
--- a/satellites/ffmpeg.sat
+++ b/satellites/ffmpeg.sat
@@ -1,6 +1,5 @@
 name=ffmpeg
 version=3.4.1
-update_url='https://ffmpeg.org/download.html'
 
 dlextract "http://ffmpeg.org/releases/$name-$version.tar.bz2" \
           'bbf3fcded80c33968c91bf323a744286'
diff --git a/satellites/firejail.sat b/satellites/firejail.sat
index c456c88..797cc36 100644
--- a/satellites/firejail.sat
+++ b/satellites/firejail.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=firejail
 version=0.9.52
-update_url="https://github.com/netblue30/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/netblue30/firejail/archive/$version/$name-$version.tar.gz" \
           'a8865f53193ca8dc3f5a8882136119df'
diff --git a/satellites/firmtool.sat b/satellites/firmtool.sat
index f02c6bb..be87fd6 100644
--- a/satellites/firmtool.sat
+++ b/satellites/firmtool.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=firmtool
 version=1.3
-update_url="https://github.com/TuxSH/firmtool/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/TuxSH/$name/archive/v$version/$name-$version.tar.gz" \
           'b80c4165a2babb469f687204723d8b9e'
diff --git a/satellites/gifsicle.sat b/satellites/gifsicle.sat
index 896a63c..440ee6c 100644
--- a/satellites/gifsicle.sat
+++ b/satellites/gifsicle.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=gifsicle
 version=1.89
-update_url="https://www.lcdf.org/$name/"
 
 dlextract "https://www.lcdf.org/$name/$name-$version.tar.gz" \
           'fe12e1dddc1cdd34804a2a345bb8552b'
diff --git a/satellites/glm.sat b/satellites/glm.sat
index 60dc062..1b16de8 100644
--- a/satellites/glm.sat
+++ b/satellites/glm.sat
@@ -2,8 +2,6 @@ import 'compile/cmake'
 
 name=glm
 version=0.9.8.4
-update_url="https://github.com/g-truc/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/g-truc/$name/archive/$version/$name-$version.tar.gz" \
           '26ca8792038da90f67301fa0a3d5b693'
diff --git a/satellites/go-md2man.sat b/satellites/go-md2man.sat
index fe5377a..820b982 100644
--- a/satellites/go-md2man.sat
+++ b/satellites/go-md2man.sat
@@ -1,7 +1,5 @@
 name=go-md2man
 version=1.0.7
-update_url="https://github.com/cpuguy83/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 # Go doesn't like being stripped
 options="!strip,$options"
diff --git a/satellites/go.sat b/satellites/go.sat
index 17647fc..e1c9c88 100644
--- a/satellites/go.sat
+++ b/satellites/go.sat
@@ -2,7 +2,6 @@ name=go
 majver=1.9
 version=$majver
 bootstrap_version=1.4.3
-update_url='https://golang.org/dl/'
 
 # Go doesn't like being stripped
 options="!strip,$options"
diff --git a/satellites/hostapd.sat b/satellites/hostapd.sat
index a69823d..4e13801 100644
--- a/satellites/hostapd.sat
+++ b/satellites/hostapd.sat
@@ -1,6 +1,5 @@
 name=hostapd
 version=2.6
-update_url="http://w1.fi/$name/"
 
 dlextract "http://w1.fi/releases/$name-$version.tar.gz" \
           'eaa56dce9bd8f1d195eb62596eab34c7'
diff --git a/satellites/i3.sat b/satellites/i3.sat
index 9bd8c65..5fdc363 100644
--- a/satellites/i3.sat
+++ b/satellites/i3.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=i3
 version=4.14.1
-update_url='http://i3wm.org/downloads/'
 
 define_option '!gaps: Use the i3-gaps fork'
 define_option '!patch: Apply some custom patches'
diff --git a/satellites/i3lock.sat b/satellites/i3lock.sat
index 32106b9..6bb00ba 100644
--- a/satellites/i3lock.sat
+++ b/satellites/i3lock.sat
@@ -1,6 +1,5 @@
 name=i3lock
 version=2.10
-update_url="https://i3wm.org/$name/"
 
 define_option 'pam: Use PAM for authentication'
 
diff --git a/satellites/i3status.sat b/satellites/i3status.sat
index 2d94799..748c0ed 100644
--- a/satellites/i3status.sat
+++ b/satellites/i3status.sat
@@ -1,6 +1,5 @@
 name=i3status
 version=2.11
-update_url="https://i3wm.org/$name/"
 
 dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \
           'a5c0a364d917ffc57c42af3f6936e700'
diff --git a/satellites/iasl.sat b/satellites/iasl.sat
index c2bf385..8fed3cb 100644
--- a/satellites/iasl.sat
+++ b/satellites/iasl.sat
@@ -1,7 +1,5 @@
 name=acpica
 version=20170629
-update_url='https://acpica.org/downloads'
-update_names="/files/$name-unix-$version.tar.gz"
 
 dlextract "https://acpica.org/sites/$name/files/$name-unix-$version.tar.gz" \
           '7ed057451c602d994d629ece68bf09ae'
diff --git a/satellites/icedtea.sat b/satellites/icedtea.sat
index c618306..155539f 100644
--- a/satellites/icedtea.sat
+++ b/satellites/icedtea.sat
@@ -6,8 +6,6 @@ version_bootstrap=2.6.11
 version_gcc=6.4.0
 version_ecj=4.9
 version_apache_ant=1.9.9
-update_url='http://icedtea.wildebeest.org/download/source/'
-update_names="<a href=\"$name-$version.tar.gz\">$name-"
 
 define_option '!bootstrap: Bootstrap this program'
 
diff --git a/satellites/imlib2.sat b/satellites/imlib2.sat
index 03fd6a6..f03ce74 100644
--- a/satellites/imlib2.sat
+++ b/satellites/imlib2.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=imlib2
 version=1.4.10
-update_url="https://sourceforge.net/projects/enlightenment/files/$name-src/"
-update_names="/projects/enlightenment/files/$name-src/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/enlightenment/files/$name-src/$version/$name-$version.tar.bz2" \
           'a0de8524592bbd9f24fcc6cb8352137c'
diff --git a/satellites/iucode-tool.sat b/satellites/iucode-tool.sat
index 101b691..8251b3e 100644
--- a/satellites/iucode-tool.sat
+++ b/satellites/iucode-tool.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=iucode-tool
 version=2.1.2
-update_url="https://gitlab.com/$name/releases/tree/master"
 
 dlextract "https://gitlab.com/$name/releases/raw/master/${name}_$version.tar.xz" \
           'c6f131a0b69443f5498782a2335973fa'
diff --git a/satellites/json-glib.sat b/satellites/json-glib.sat
index 1cd447f..ff8369a 100644
--- a/satellites/json-glib.sat
+++ b/satellites/json-glib.sat
@@ -3,7 +3,6 @@ import 'compile/meson'
 name=json-glib
 majver=1.3
 version=$majver.2
-update_url="https://download.gnome.org/sources/$name/cache.json"
 
 dlextract "https://download.gnome.org/sources/$name/$majver/$name-$version.tar.xz" \
           'ff8469fe2f6243dc7e7ffd17a3641618'
diff --git a/satellites/libass.sat b/satellites/libass.sat
index 8850d21..bc51e5f 100644
--- a/satellites/libass.sat
+++ b/satellites/libass.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libass
 version=0.14.0
-update_url="https://github.com/libass/$name/releases"
 
 dlextract "https://github.com/libass/$name/releases/download/$version/$name-$version.tar.xz" \
           '5b8c23340654587b8a472cb74ee9366b'
diff --git a/satellites/libconfig.sat b/satellites/libconfig.sat
index 9ad79df..7552f1e 100644
--- a/satellites/libconfig.sat
+++ b/satellites/libconfig.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libconfig
 version=1.5
-update_url="http://www.hyperrealm.com/$name/"
 
 dlextract "http://www.hyperrealm.com/$name/$name-$version.tar.gz" \
           'a939c4990d74e6fc1ee62be05716f633'
diff --git a/satellites/libedit.sat b/satellites/libedit.sat
index 6d9e5ed..0904eb4 100644
--- a/satellites/libedit.sat
+++ b/satellites/libedit.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libedit
 version=20170329-3.1
-update_url="http://thrysoee.dk/editline/"
 
 dlextract "http://thrysoee.dk/editline/$name-$version.tar.gz" \
           'c57a0690e62ef523c083598730272cfd'
diff --git a/satellites/libev.sat b/satellites/libev.sat
index 266a4be..f0a544d 100644
--- a/satellites/libev.sat
+++ b/satellites/libev.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libev
 version=4.24
-update_url="http://dist.schmorp.de/$name/"
 
 dlextract "http://dist.schmorp.de/$name/$name-$version.tar.gz" \
           '94459a5a22db041dec6f98424d6efe54'
diff --git a/satellites/libmodplug.sat b/satellites/libmodplug.sat
index 0bde664..ae7c5db 100644
--- a/satellites/libmodplug.sat
+++ b/satellites/libmodplug.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=libmodplug
 version=0.8.8.5
-update_url='http://modplug-xmms.sourceforge.net/'
-update_names="$name-$version.tar.gz/download"
 
 dlextract "https://sourceforge.net/projects/modplug-xmms/files/$name/$version/$name-$version.tar.gz" \
           '5f30241db109d647781b784e62ddfaa1'
diff --git a/satellites/libpeas.sat b/satellites/libpeas.sat
index 6876782..94c2c39 100644
--- a/satellites/libpeas.sat
+++ b/satellites/libpeas.sat
@@ -3,7 +3,6 @@ import 'compile/configure'
 name=libpeas
 majver=1.21
 version=$majver.0
-update_url="https://download.gnome.org/sources/$name/cache.json"
 
 dlextract "https://download.gnome.org/sources/$name/$majver/$name-$version.tar.xz" \
           '2ee1b1507bd0a9da864970ab3f977f33'
diff --git a/satellites/libsass.sat b/satellites/libsass.sat
index d08ddce..7ac981d 100644
--- a/satellites/libsass.sat
+++ b/satellites/libsass.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=libsass
 version=3.4.5
-update_url="https://github.com/sass/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/sass/$name/archive/$version/$name-$version.tar.gz" \
           'c00583e76b11dd7ae1a577a6f8214803'
diff --git a/satellites/libseccomp.sat b/satellites/libseccomp.sat
index 8e88f3a..9360d29 100644
--- a/satellites/libseccomp.sat
+++ b/satellites/libseccomp.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libseccomp
 version=2.3.2
-update_url="https://github.com/seccomp/$name/releases"
 
 dlextract "https://github.com/seccomp/$name/releases/download/v$version/$name-$version.tar.gz" \
           'e74a626bea0cd607c23229b10b5f93da'
diff --git a/satellites/libtorrent-rasterbar.sat b/satellites/libtorrent-rasterbar.sat
index ce35104..9da9757 100644
--- a/satellites/libtorrent-rasterbar.sat
+++ b/satellites/libtorrent-rasterbar.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libtorrent-rasterbar
 version=1.1.7
-update_url='https://github.com/arvidn/libtorrent/releases'
 
 dlextract "https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(echo "$version" | tr . _)/$name-$version.tar.gz" \
           '8fb89848786cd4406d8e90785cbf8532'
diff --git a/satellites/libwebp.sat b/satellites/libwebp.sat
index 77e5026..4de6d3a 100644
--- a/satellites/libwebp.sat
+++ b/satellites/libwebp.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libwebp
 version=0.6.0
-update_url='https://developers.google.com/speed/webp/download'
 
 dlextract "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$name-$version.tar.gz" \
           '19a6e926ab1721268df03161b84bb4a0'
diff --git a/satellites/libxkbcommon.sat b/satellites/libxkbcommon.sat
index b1c78c7..9ee0f70 100644
--- a/satellites/libxkbcommon.sat
+++ b/satellites/libxkbcommon.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=libxkbcommon
 version=0.8.0
-update_url='http://xkbcommon.org/'
 
 dlextract "http://xkbcommon.org/download/$name-$version.tar.xz" \
           '7d0e4c4a137d0ac45bf6b328c84c3a81'
diff --git a/satellites/liferea.sat b/satellites/liferea.sat
index 4eeeb80..f6151dd 100644
--- a/satellites/liferea.sat
+++ b/satellites/liferea.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=liferea
 version=1.12.1
-update_url="https://github.com/lwindolf/$name/releases"
 
 define_option '!patch: Apply some custom patches'
 
diff --git a/satellites/love.sat b/satellites/love.sat
index b405ccd..ace9d7d 100644
--- a/satellites/love.sat
+++ b/satellites/love.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=love
 version=0.10.2
-update_url='http://love2d.org/'
 
 dlextract "https://bitbucket.org/rude/love/downloads/$name-$version-linux-src.tar.gz" \
           '11936c4fafe666bdea077cb006c060a4'
diff --git a/satellites/lua.sat b/satellites/lua.sat
index 8d8371f..2cea38f 100644
--- a/satellites/lua.sat
+++ b/satellites/lua.sat
@@ -1,7 +1,6 @@
 name=lua
 majver=5.3
 version=$majver.4
-update_url="http://www.lua.org/download.html"
 
 dlextract "http://www.lua.org/ftp/$name-$version.tar.gz" \
           '53a9c68bcc0eda58bdc2095ad5cdfc63'
diff --git a/satellites/luajit.sat b/satellites/luajit.sat
index d6a25a4..265808b 100644
--- a/satellites/luajit.sat
+++ b/satellites/luajit.sat
@@ -1,7 +1,5 @@
 name=LuaJIT
 version=2.0.5
-update_url='http://luajit.org/download.html'
-update_names="href=\"download/$name-$version.tar.gz\""
 
 dlextract "http://luajit.org/download/$name-$version.tar.gz" \
           '48353202cbcacab84ee41a5a70ea0a2c'
diff --git a/satellites/maim.sat b/satellites/maim.sat
index 880e915..2b4edf9 100644
--- a/satellites/maim.sat
+++ b/satellites/maim.sat
@@ -2,8 +2,6 @@ import 'compile/cmake'
 
 name=maim
 version=5.4.64
-update_url="https://github.com/naelstrof/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/naelstrof/$name/archive/v$version/$name-$version.tar.gz" \
           '174c5d49caded14e1235d9e1af026519'
diff --git a/satellites/markdown.sat b/satellites/markdown.sat
index 7334cb0..7782ae4 100644
--- a/satellites/markdown.sat
+++ b/satellites/markdown.sat
@@ -1,6 +1,5 @@
 name=Markdown
 version=1.0.1
-update_url='https://daringfireball.net/projects/markdown/'
 
 download "https://daringfireball.net/projects/downloads/${name}_$version.zip" \
          'f17b3c2b2830c6fd2fe0098226e59a2f'
diff --git a/satellites/meson.sat b/satellites/meson.sat
index c5a25f7..45548e5 100644
--- a/satellites/meson.sat
+++ b/satellites/meson.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=meson
 version=0.42.0
-update_url="https://github.com/mesonbuild/$name/releases"
 
 dlextract "https://github.com/mesonbuild/$name/releases/download/$version/$name-$version.tar.gz" \
           'b2518db2c56348f17a65d5edb04e0c60'
diff --git a/satellites/mozplugger.sat b/satellites/mozplugger.sat
index cc96c7f..006f525 100644
--- a/satellites/mozplugger.sat
+++ b/satellites/mozplugger.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=mozplugger
 version=2.1.6
-update_url='http://mozplugger.mozdev.org/'
 
 dlextract "http://mozplugger.mozdev.org/files/$name-$version.tar.gz" \
           'abb42f3c3c2f3a940c1252a83f254116'
diff --git a/satellites/mpv.sat b/satellites/mpv.sat
index f1ce654..7f94674 100644
--- a/satellites/mpv.sat
+++ b/satellites/mpv.sat
@@ -2,8 +2,6 @@ import 'compile/waf'
 
 name=mpv
 version=0.27.0
-update_url="https://github.com/mpv-player/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/mpv-player/$name/archive/v$version/$name-$version.tar.gz" \
           'ec86f42b091d891f9a932de0f6e873ad'
diff --git a/satellites/ninja.sat b/satellites/ninja.sat
index 3641494..4a5b5f4 100644
--- a/satellites/ninja.sat
+++ b/satellites/ninja.sat
@@ -1,7 +1,5 @@
 name=ninja
 version=1.8.2
-update_url="https://github.com/ninja-build/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 define_option '!bootstrap: Bootstrap this program'
 
diff --git a/satellites/nxengine-evo.sat b/satellites/nxengine-evo.sat
index 90e5618..88976dd 100644
--- a/satellites/nxengine-evo.sat
+++ b/satellites/nxengine-evo.sat
@@ -2,8 +2,6 @@ import 'compile/cmake'
 
 name=nxengine-evo
 version=2.6.2
-update_url="https://github.com/isage/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 define_option 'console_key=`: The key used to access the debug console'
 
diff --git a/satellites/oomox.sat b/satellites/oomox.sat
index 6c431fd..66055a5 100644
--- a/satellites/oomox.sat
+++ b/satellites/oomox.sat
@@ -10,8 +10,6 @@ version_materia_theme=62d928cc46169b575822cc40b6c1a0627d1c3064
 version_archdroid_icon_theme=6dc4c92689ea2ce99534d6f461283efdf8ffd270
 version_gnome_colors_icon_theme=2f3d8dd3ce59e260803660f158a7a91d643518bf
 version_oomoxify=675fedce9a47745212b062e13a7e51b01f2bb581
-update_url="https://github.com/actionless/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/actionless/$name/archive/$version/$name-$version.tar.gz" \
           'fa6967c43494d1e859fef534a31a0589'
diff --git a/satellites/openal.sat b/satellites/openal.sat
index b995b24..33b371b 100644
--- a/satellites/openal.sat
+++ b/satellites/openal.sat
@@ -2,7 +2,6 @@ import 'compile/cmake'
 
 name=openal-soft
 version=1.18.0
-update_url="https://github.com/kcat/$name/releases"
 
 dlextract "https://github.com/kcat/$name/archive/$name-$version.tar.gz" \
           'a714a3ee1a5d5e2d963f996bc9af50f2'
diff --git a/satellites/p7zip.sat b/satellites/p7zip.sat
index 154d09c..9e736e0 100644
--- a/satellites/p7zip.sat
+++ b/satellites/p7zip.sat
@@ -1,7 +1,5 @@
 name=p7zip
 version=16.02
-update_url="https://sourceforge.net/projects/$name/files/$name/"
-update_names="/projects/$name/files/$name/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name/$version/${name}_${version}_src_all.tar.bz2" \
           'a0128d661cfe7cc8c121e73519c54fbf'
diff --git a/satellites/palemoon-decentraleyes.sat b/satellites/palemoon-decentraleyes.sat
index b647ea3..ff03762 100644
--- a/satellites/palemoon-decentraleyes.sat
+++ b/satellites/palemoon-decentraleyes.sat
@@ -2,7 +2,6 @@
 
 name=decentraleyes
 version=1.3.10
-update_url="https://github.com/Synzvato/$name/releases"
 
 download "https://addons.palemoon.org/?component=download&id=jid1-BoFifL9Vbdl2zQ@jetpack&version=$version" \
          '95dafa4d7b8452f5613da068b1309cd6' \
diff --git a/satellites/palemoon-greasemonkey.sat b/satellites/palemoon-greasemonkey.sat
index 25c2e06..4281004 100644
--- a/satellites/palemoon-greasemonkey.sat
+++ b/satellites/palemoon-greasemonkey.sat
@@ -1,8 +1,6 @@
 name=greasemonkey
 majver=3.31
 version=${majver}Fork
-update_url="https://github.com/janekptacijarabaci/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/janekptacijarabaci/$name/archive/$version/$name-$version.tar.gz" \
           'd8324a778a001f8cf71e34209c047bf7'
diff --git a/satellites/palemoon-pentadactyl.sat b/satellites/palemoon-pentadactyl.sat
index a363f04..47ebcad 100644
--- a/satellites/palemoon-pentadactyl.sat
+++ b/satellites/palemoon-pentadactyl.sat
@@ -1,6 +1,5 @@
 name=pentadactyl
 version=1.2pre-pm-3
-update_url="https://github.com/madand/$name-pm/releases"
 
 dlextract "https://github.com/madand/$name-pm/archive/$name-$version.tar.gz" \
           '9ffbd57120c5dd2b5b84208f5d6a0571'
diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat
index 1bd1e81..5d66589 100644
--- a/satellites/palemoon-ublock.sat
+++ b/satellites/palemoon-ublock.sat
@@ -2,8 +2,6 @@ import 'vcs/git'
 
 name=uBlock
 version=1.15.24
-update_url="https://github.com/gorhill/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \
           '003bcfaf1a7150f0d8c5e876d767e8d6'
diff --git a/satellites/palemoon-umatrix.sat b/satellites/palemoon-umatrix.sat
index f94dde1..16acd47 100644
--- a/satellites/palemoon-umatrix.sat
+++ b/satellites/palemoon-umatrix.sat
@@ -2,8 +2,6 @@ import 'vcs/git'
 
 name=uMatrix
 version=1.1.4
-update_url="https://github.com/gorhill/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \
           '2ba41e4ad567102c7bb8ec0031c2c87f'
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index a182ec4..f2a52b3 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -4,8 +4,6 @@ name=Pale-Moon
 version=27.8.3
 version_gcc=4.9.4
 version_autoconf=2.13
-update_url="https://github.com/MoonchildProductions/$name/releases"
-update_names="/archive/${version}_Release.tar.gz"
 
 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
           '0a9beb55dcce7f3cce9acc30309fe1fe'
diff --git a/satellites/pcre2.sat b/satellites/pcre2.sat
index 85997ba..0c5cd7b 100644
--- a/satellites/pcre2.sat
+++ b/satellites/pcre2.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=pcre2
 version=10.23
-update_url="https://sourceforge.net/projects/pcre/files/$name/"
-update_names="/projects/pcre/files/$name/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/pcre/files/$name/$version/$name-$version.tar.bz2" \
           'b2cd00ca7e24049040099b0a46bb3649'
diff --git a/satellites/physfs.sat b/satellites/physfs.sat
index 1ce81ea..e717439 100644
--- a/satellites/physfs.sat
+++ b/satellites/physfs.sat
@@ -2,7 +2,6 @@ import 'compile/cmake'
 
 name=physfs
 version=2.0.3
-update_url="https://www.icculus.org/$name/downloads/"
 
 dlextract "https://www.icculus.org/$name/downloads/$name-$version.tar.bz2" \
           'c2c727a8a8deb623b521b52d0080f613'
diff --git a/satellites/profile-sync-daemon.sat b/satellites/profile-sync-daemon.sat
index ef99801..fb3c3c8 100644
--- a/satellites/profile-sync-daemon.sat
+++ b/satellites/profile-sync-daemon.sat
@@ -1,7 +1,5 @@
 name=profile-sync-daemon
 version=6.31
-update_url="https://github.com/graysky2/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/graysky2/$name/archive/v$version/$name-$version.tar.gz" \
           '159cabc39972be8d72e760a0025b5cd9'
diff --git a/satellites/python3-appdirs.sat b/satellites/python3-appdirs.sat
index fc6fbb3..e52fc24 100644
--- a/satellites/python3-appdirs.sat
+++ b/satellites/python3-appdirs.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=appdirs
 version=1.4.3
-update_url="https://github.com/ActiveState/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/ActiveState/$name/archive/$version/$name-$version.tar.gz" \
           'b0bd73c5dac1bee973e60adcbdcbb5ed'
diff --git a/satellites/python3-asn1crypto.sat b/satellites/python3-asn1crypto.sat
index fa9d23f..1e45050 100644
--- a/satellites/python3-asn1crypto.sat
+++ b/satellites/python3-asn1crypto.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=asn1crypto
 version=0.22.0
-update_url="https://github.com/wbond/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/wbond/$name/archive/$version/$name-$version.tar.gz" \
           '583cd7106c5137a208bd14f876ed2001'
diff --git a/satellites/python3-cairo.sat b/satellites/python3-cairo.sat
index f212d46..3968ff6 100644
--- a/satellites/python3-cairo.sat
+++ b/satellites/python3-cairo.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=pycairo
 version=1.15.1
-update_url="https://github.com/pygobject/$name/releases"
 
 dlextract "https://github.com/pygobject/$name/releases/download/v$version/$name-$version.tar.gz" \
           '29620ad9b0fa4a7052760e4fa4b71b4c'
diff --git a/satellites/python3-certifi.sat b/satellites/python3-certifi.sat
index 3db12ed..723106a 100644
--- a/satellites/python3-certifi.sat
+++ b/satellites/python3-certifi.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=python-certifi
 version=2017.04.17
-update_url="https://github.com/certifi/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/certifi/$name/archive/$version/$name-$version.tar.gz" \
           '34d86e84752e1870704228ef20868ba5'
diff --git a/satellites/python3-cffi.sat b/satellites/python3-cffi.sat
index 4cb1ecb..718c0cf 100644
--- a/satellites/python3-cffi.sat
+++ b/satellites/python3-cffi.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=cffi
 version=1.11.2
-update_url="https://pypi.python.org/pypi/$name"
 
 dlextract "https://pypi.python.org/packages/c9/70/89b68b6600d479034276fed316e14b9107d50a62f5627da37fafe083fde3/$name-$version.tar.gz" \
           'a731487324b501c8295221b629d3f5f3'
diff --git a/satellites/python3-chardet.sat b/satellites/python3-chardet.sat
index 66d6401..1e0f8f6 100644
--- a/satellites/python3-chardet.sat
+++ b/satellites/python3-chardet.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=chardet
 version=3.0.4
-update_url="https://github.com/chardet/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/chardet/$name/archive/$version/$name-$version.tar.gz" \
           'f37b246e5136c96828bb92f86d2354d1'
diff --git a/satellites/python3-cparser.sat b/satellites/python3-cparser.sat
index e5b8e4d..acdf6ee 100644
--- a/satellites/python3-cparser.sat
+++ b/satellites/python3-cparser.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=pycparser
 version=2.18
-update_url="https://github.com/eliben/$name/releases"
-update_names="/archive/release_v$version.tar.gz"
 
 dlextract "https://github.com/eliben/$name/archive/release_v$version/$name-$version.tar.gz" \
           'c609e8b0e3941d3f32d2fd13fba803e1'
diff --git a/satellites/python3-cryptodome.sat b/satellites/python3-cryptodome.sat
index 5f96e65..c468a99 100644
--- a/satellites/python3-cryptodome.sat
+++ b/satellites/python3-cryptodome.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=pycryptodome
 version=3.4.6
-update_url="https://github.com/Legrandin/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/Legrandin/$name/archive/v$version/$name-$version.tar.gz" \
           '23f8d1921b69df462f2e62af5aaf4ce9'
diff --git a/satellites/python3-cryptography.sat b/satellites/python3-cryptography.sat
index 02e6592..8cdc3a5 100644
--- a/satellites/python3-cryptography.sat
+++ b/satellites/python3-cryptography.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=cryptography
 version=2.0
-update_url="https://github.com/pyca/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/pyca/$name/archive/$version/$name-$version.tar.gz" \
           'fca95e34cd920837f2d2f83390a41dc1'
diff --git a/satellites/python3-docutils.sat b/satellites/python3-docutils.sat
index a4a5168..ceeb238 100644
--- a/satellites/python3-docutils.sat
+++ b/satellites/python3-docutils.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=docutils
 version=0.13.1
-update_url='http://docutils.sourceforge.net/'
 
 dlextract "http://prdownloads.sourceforge.net/$name/$name-$version.tar.gz" \
           'ea4a893c633c788be9b8078b6b305d53'
diff --git a/satellites/python3-gobject.sat b/satellites/python3-gobject.sat
index 403a23f..df6616b 100644
--- a/satellites/python3-gobject.sat
+++ b/satellites/python3-gobject.sat
@@ -3,7 +3,6 @@ import 'compile/configure'
 name=pygobject
 majver=3.25
 version=$majver.1
-update_url="https://download.gnome.org/sources/$name/cache.json"
 
 dlextract "https://download.gnome.org/sources/$name/$majver/$name-$version.tar.xz" \
           '493319f2a9f5931aee82429b02aba375'
diff --git a/satellites/python3-idna.sat b/satellites/python3-idna.sat
index 36fd2b2..6efbb4d 100644
--- a/satellites/python3-idna.sat
+++ b/satellites/python3-idna.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=idna
 version=2.5
-update_url="https://github.com/kjd/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/kjd/$name/archive/v$version/$name-$version.tar.gz" \
           'f31cd2faf6954e13978f1d802a9dc9b6'
diff --git a/satellites/python3-iso3166.sat b/satellites/python3-iso3166.sat
index 3f1075a..e0de64f 100644
--- a/satellites/python3-iso3166.sat
+++ b/satellites/python3-iso3166.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=iso3166
 version=0.8
-update_url="https://pypi.python.org/pypi/$name"
 
 dlextract "https://pypi.python.org/packages/46/06/64145b8d6be8474db1f09f6b01a083921c11a4c979d029677c7e943d2433/$name-$version.tar.gz" \
           '9b7a42df80495fe253d6edd035974128'
diff --git a/satellites/python3-iso639.sat b/satellites/python3-iso639.sat
index 2b9a055..aa02fe6 100644
--- a/satellites/python3-iso639.sat
+++ b/satellites/python3-iso639.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=iso639
 version=0.4.5
-update_url="https://github.com/noumar/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/noumar/$name/archive/$version/$name-$version.tar.gz" \
           '4ecf572a2a14f628f141deb4d257827b'
diff --git a/satellites/python3-packaging.sat b/satellites/python3-packaging.sat
index 9a6fa64..b850693 100644
--- a/satellites/python3-packaging.sat
+++ b/satellites/python3-packaging.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=packaging
 version=16.8
-update_url="https://github.com/pypa/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/pypa/$name/archive/$version/$name-$version.tar.gz" \
           '02c9a248368c7b9d3236cac349a67825'
diff --git a/satellites/python3-parsing.sat b/satellites/python3-parsing.sat
index 4be68f3..76bca4e 100644
--- a/satellites/python3-parsing.sat
+++ b/satellites/python3-parsing.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=pyparsing
 version=2.2.0
-update_url="https://sourceforge.net/projects/$name/files/$name/"
-update_names="/projects/$name/files/$name/$name-$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.gz" \
           '0214e42d63af850256962b6744c948d9'
diff --git a/satellites/python3-requests.sat b/satellites/python3-requests.sat
index 9bcc32d..94b9cc2 100644
--- a/satellites/python3-requests.sat
+++ b/satellites/python3-requests.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=requests
 version=2.18.1
-update_url="https://github.com/kennethreitz/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/kennethreitz/$name/archive/v$version/$name-$version.tar.gz" \
           'a3d6f123e328ab97131f8232a17eebdc'
diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index 06d683d..42799e5 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=setuptools
 version=36.2.0
-update_url="https://github.com/pypa/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 define_option 'easy_install-symlink: Install the easy_install symlink (it may conflict with python2)'
 
diff --git a/satellites/python3-six.sat b/satellites/python3-six.sat
index 75c7c2e..5694390 100644
--- a/satellites/python3-six.sat
+++ b/satellites/python3-six.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=six
 version=1.10.0
-update_url="https://pypi.python.org/pypi/$name"
 
 dlextract "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/$name-$version.tar.gz" \
           '34eed507548117b2ab523ab14b2f8b55'
diff --git a/satellites/python3-socks.sat b/satellites/python3-socks.sat
index 9a7f4d7..4631b6b 100644
--- a/satellites/python3-socks.sat
+++ b/satellites/python3-socks.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=PySocks
 version=1.6.8
-update_url="https://github.com/Anorov/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/Anorov/$name/archive/$version/$name-$version.tar.gz" \
           'ec13b71d9fe06433ae7fa7a96da71822'
diff --git a/satellites/python3-urllib3.sat b/satellites/python3-urllib3.sat
index 68797ea..373c560 100644
--- a/satellites/python3-urllib3.sat
+++ b/satellites/python3-urllib3.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=urllib3
 version=1.21.1
-update_url="https://github.com/shazow/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/shazow/$name/archive/$version/$name-$version.tar.gz" \
           'b0a2c692ea273dc120b209a027b0df3c'
diff --git a/satellites/python3-websocket-client.sat b/satellites/python3-websocket-client.sat
index d610cb9..5af28d0 100644
--- a/satellites/python3-websocket-client.sat
+++ b/satellites/python3-websocket-client.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=websocket-client
 version=0.46.0
-update_url="https://github.com/$name/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz" \
           '59af7779c3e8bf6653a2e159f58ee328'
diff --git a/satellites/python3-yaml.sat b/satellites/python3-yaml.sat
index bd0527b..e37d41c 100644
--- a/satellites/python3-yaml.sat
+++ b/satellites/python3-yaml.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=PyYAML
 version=3.12
-update_url="http://pyyaml.org/wiki/$name"
 
 dlextract "http://pyyaml.org/download/pyyaml/$name-$version.tar.gz" \
           '4c129761b661d181ebf7ff4eb2d79950'
diff --git a/satellites/python3.sat b/satellites/python3.sat
index 061c8da..dd39fc3 100644
--- a/satellites/python3.sat
+++ b/satellites/python3.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=Python
 version=3.6.3
-update_url='https://www.python.org/downloads/'
 
 define_option '2to3-symlink: Install the 2to3 symlink (it may conflict with python2)'
 
diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat
index 61b1102..80b1627 100644
--- a/satellites/qbittorrent.sat
+++ b/satellites/qbittorrent.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=qbittorrent
 version=4.0.4
-update_url='https://www.qbittorrent.org/download.php'
 
 define_option '!patch: Apply some custom patches'
 
diff --git a/satellites/qemu.sat b/satellites/qemu.sat
index 0b8b44b..c004b5e 100644
--- a/satellites/qemu.sat
+++ b/satellites/qemu.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=qemu
 version=2.10.1
-update_url='http://www.qemu-project.org/download/'
 
 define_option 'gtk3: Build with gtk3 support'
 define_option 'targets=all: Define what targets to build (space-separated list)'
diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index c5c7600..0a4c667 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -2,8 +2,6 @@ name=qt5
 submodule=base
 majver=5.10
 version=$majver.1
-update_url='https://www1.qt.io/offline-installers/'
-update_names="qt-everywhere-opensource-src-$version.tar.xz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
           '1d5ebf49abb2897d573cee622a12f54d'
diff --git a/satellites/qt5-svg.sat b/satellites/qt5-svg.sat
index c299fd1..9a2c315 100644
--- a/satellites/qt5-svg.sat
+++ b/satellites/qt5-svg.sat
@@ -4,8 +4,6 @@ name=qt5
 submodule=svg
 majver=5.10
 version=$majver.1
-update_url='https://www1.qt.io/offline-installers/'
-update_names="qt-everywhere-opensource-src-$version.tar.xz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
           'cc0e01cf8c81ad18231b8ac1c409f3cb'
diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat
index 49426f4..d175cca 100644
--- a/satellites/qt5-tools.sat
+++ b/satellites/qt5-tools.sat
@@ -4,8 +4,6 @@ name=qt5
 submodule=tools
 majver=5.10
 version=$majver.1
-update_url='https://www1.qt.io/offline-installers/'
-update_names="qt-everywhere-opensource-src-$version.tar.xz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
           '95526aac12236421f05634c8df4f52f4'
diff --git a/satellites/qt5-x11extras.sat b/satellites/qt5-x11extras.sat
index 5da6c3c..7ee046c 100644
--- a/satellites/qt5-x11extras.sat
+++ b/satellites/qt5-x11extras.sat
@@ -4,8 +4,6 @@ name=qt5
 submodule=x11extras
 majver=5.10
 version=$majver.1
-update_url='https://www1.qt.io/offline-installers/'
-update_names="qt-everywhere-opensource-src-$version.tar.xz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
           '55ef3736f245d011341c0e3d052071a4'
diff --git a/satellites/qt5ct.sat b/satellites/qt5ct.sat
index 198a284..ef4187d 100644
--- a/satellites/qt5ct.sat
+++ b/satellites/qt5ct.sat
@@ -2,7 +2,6 @@ import 'compile/qt'
 
 name=qt5ct
 version=0.35
-update_url="https://sourceforge.net/projects/$name/files/"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name-$version.tar.bz2" \
           '43fc124f6a4d5804b51d5453b5994de4'
diff --git a/satellites/radare2.sat b/satellites/radare2.sat
index a043a11..ffdc94b 100644
--- a/satellites/radare2.sat
+++ b/satellites/radare2.sat
@@ -6,8 +6,6 @@ import 'compile/configure'
 
 name=radare2
 version=2.5.0
-update_url='http://rada.re/r/down.html'
-update_names="$name-$version.tar.gz\">$name"
 
 dlextract "http://radare.mikelloc.com/get/$version/$name-$version.tar.gz" \
           '23610bcd268efa097aed3821bc006bbb'
diff --git a/satellites/rgbds.sat b/satellites/rgbds.sat
index 9da5e3f..2414b51 100644
--- a/satellites/rgbds.sat
+++ b/satellites/rgbds.sat
@@ -1,6 +1,5 @@
 name=rgbds
 version=0.3.6
-update_url="https://github.com/rednex/$name/releases"
 
 dlextract "https://github.com/rednex/$name/releases/download/v$version/$name-$version.tar.gz" \
           '04ef8d9670a1a4c12a510047fcb2750d'
diff --git a/satellites/rofi.sat b/satellites/rofi.sat
index a381578..56f2116 100644
--- a/satellites/rofi.sat
+++ b/satellites/rofi.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=rofi
 version=1.3.1
-update_url="https://github.com/DaveDavenport/$name/releases"
 
 dlextract "https://github.com/DaveDavenport/$name/releases/download/$version/$name-$version.tar.xz" \
           'c1b0e12686cea1dab112586b0b1a5257'
diff --git a/satellites/rxvt-unicode.sat b/satellites/rxvt-unicode.sat
index a22a6f0..82ed51f 100644
--- a/satellites/rxvt-unicode.sat
+++ b/satellites/rxvt-unicode.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=rxvt-unicode
 version=9.22
-update_url="http://dist.schmorp.de/$name/"
 
 dlextract "http://dist.schmorp.de/$name/$name-$version.tar.bz2" \
           '93782dec27494eb079467dacf6e48185'
diff --git a/satellites/sassc.sat b/satellites/sassc.sat
index 57b7ac6..75bbd51 100644
--- a/satellites/sassc.sat
+++ b/satellites/sassc.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=sassc
 version=3.4.5
-update_url="https://github.com/sass/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/sass/$name/archive/$version/$name-$version.tar.gz" \
           'd134a7ddd85f1b070bac11943f608b51'
diff --git a/satellites/sdl2.sat b/satellites/sdl2.sat
index dbb26cb..3af54ab 100644
--- a/satellites/sdl2.sat
+++ b/satellites/sdl2.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=SDL2
 version=2.0.5
-update_url='https://libsdl.org/download-2.0.php'
 
 dlextract "https://libsdl.org/release/$name-$version.tar.gz" \
           'd4055424d556b4a908aa76fad63abd3c'
diff --git a/satellites/sdl2_image.sat b/satellites/sdl2_image.sat
index f609825..e550c65 100644
--- a/satellites/sdl2_image.sat
+++ b/satellites/sdl2_image.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=SDL2_image
 version=2.0.1
-update_url='https://www.libsdl.org/projects/SDL_image/'
 
 dlextract "https://www.libsdl.org/projects/SDL_image/release/$name-$version.tar.gz" \
           'd94b94555ba022fa249a53a021dc3606'
diff --git a/satellites/sdl2_mixer.sat b/satellites/sdl2_mixer.sat
index dbdaa0d..3792d71 100644
--- a/satellites/sdl2_mixer.sat
+++ b/satellites/sdl2_mixer.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=SDL2_mixer
 version=2.0.1
-update_url='https://www.libsdl.org/projects/SDL_mixer/'
-update_names="$name-$version.tar.gz</A>"
 
 dlextract "https://www.libsdl.org/projects/SDL_mixer/release/$name-$version.tar.gz" \
           'c6c4f556d4415871f526248f5c9a627d'
diff --git a/satellites/sdl2_net.sat b/satellites/sdl2_net.sat
index 7b0e264..4e06a4c 100644
--- a/satellites/sdl2_net.sat
+++ b/satellites/sdl2_net.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=SDL2_net
 version=2.0.1
-update_url='https://www.libsdl.org/projects/SDL_net/'
 
 dlextract "https://www.libsdl.org/projects/SDL_net/release/$name-$version.tar.gz" \
           '5c1d9d1cfa63301b141cb5c0de2ea7c4'
diff --git a/satellites/sdl2_ttf.sat b/satellites/sdl2_ttf.sat
index 36abcaa..9bcedbf 100644
--- a/satellites/sdl2_ttf.sat
+++ b/satellites/sdl2_ttf.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=SDL2_ttf
 version=2.0.14
-update_url='https://www.libsdl.org/projects/SDL_ttf/'
 
 dlextract "https://www.libsdl.org/projects/SDL_ttf/release/$name-$version.tar.gz" \
           'e53c05e1e7f1382c316afd6c763388b1'
diff --git a/satellites/slop.sat b/satellites/slop.sat
index acb6399..b73496f 100644
--- a/satellites/slop.sat
+++ b/satellites/slop.sat
@@ -2,8 +2,6 @@ import 'compile/cmake'
 
 name=slop
 version=6.3.47
-update_url="https://github.com/naelstrof/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/naelstrof/$name/archive/v$version/$name-$version.tar.gz" \
           'd094a769ac3f8d444f6a903a3f076196'
diff --git a/satellites/speedtest-cli.sat b/satellites/speedtest-cli.sat
index a5385e3..6e0bb0b 100644
--- a/satellites/speedtest-cli.sat
+++ b/satellites/speedtest-cli.sat
@@ -2,8 +2,6 @@ import 'compile/python'
 
 name=speedtest-cli
 version=1.0.6
-update_url="https://github.com/sivel/$name/releases"
-update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/sivel/speedtest-cli/archive/v$version/$name-$version.tar.gz" \
           'a2b4df4a4977fa28acba082c0a4e86b2'
diff --git a/satellites/streamlink.sat b/satellites/streamlink.sat
index 2098c63..8e9d188 100644
--- a/satellites/streamlink.sat
+++ b/satellites/streamlink.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=streamlink
 version=0.11.0
-update_url="https://github.com/$name/$name/releases"
 
 dlextract "https://github.com/$name/$name/releases/download/$version/$name-$version.tar.gz" \
           'f9455fe34e0a06943084f32e3c0ee4ad'
diff --git a/satellites/syncthing.sat b/satellites/syncthing.sat
index b24b380..76d94cd 100644
--- a/satellites/syncthing.sat
+++ b/satellites/syncthing.sat
@@ -1,6 +1,5 @@
 name=syncthing
 version=0.14.38
-update_url="https://github.com/$name/$name/releases"
 
 # Go doesn't like being stripped
 options="!strip,$options"
diff --git a/satellites/teeworlds.sat b/satellites/teeworlds.sat
index 0be7b85..5532b47 100644
--- a/satellites/teeworlds.sat
+++ b/satellites/teeworlds.sat
@@ -3,7 +3,6 @@
 name=teeworlds
 version=0.6.4
 version_bam=0.4.0
-update_url='http://downloads.teeworlds.com/'
 
 dlextract "https://downloads.teeworlds.com/$name-$version-src.tar.gz" \
           '9733800c12462ac4d5a5a4f6ea750af0'
diff --git a/satellites/valgrind.sat b/satellites/valgrind.sat
index b64d1ae..591f506 100644
--- a/satellites/valgrind.sat
+++ b/satellites/valgrind.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=valgrind
 version=3.12.0
-update_url='http://valgrind.org/downloads/current.html'
-update_names="/downloads/$name-$version.tar.bz2"
 
 dlextract "http://valgrind.org/downloads/$name-$version.tar.bz2" \
           '6eb03c0c10ea917013a7622e483d61bb'
diff --git a/satellites/vbindiff.sat b/satellites/vbindiff.sat
index 11947a5..ee775d9 100644
--- a/satellites/vbindiff.sat
+++ b/satellites/vbindiff.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=vbindiff
 version=3.0_beta4
-update_url="https://www.cjmweb.net/$name"
 
 dlextract "https://www.cjmweb.net/$name/$name-$version.tar.gz" \
           'dbda80ef580e1a0975ef50b9aaa5210e'
diff --git a/satellites/volumeicon.sat b/satellites/volumeicon.sat
index 7e1bf4f..cbffbc8 100644
--- a/satellites/volumeicon.sat
+++ b/satellites/volumeicon.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=volumeicon
 version=0.5.1
-update_url="http://nullwise.com/$name.html"
 
 define_option 'gtk3: Build with gtk3 support'
 
diff --git a/satellites/waf.sat b/satellites/waf.sat
index 432d3e0..e1a89a9 100644
--- a/satellites/waf.sat
+++ b/satellites/waf.sat
@@ -2,7 +2,6 @@ import 'compile/waf'
 
 name=waf
 version=1.9.12
-update_url='https://waf.io/'
 
 dlextract "https://waf.io/$name-$version.tar.bz2" \
           '601d7f5d92c9366f1196c2dfa32dee76'
diff --git a/satellites/webfs.sat b/satellites/webfs.sat
index 80bb62a..8ff5a5e 100644
--- a/satellites/webfs.sat
+++ b/satellites/webfs.sat
@@ -1,6 +1,5 @@
 name=webfs
 version=1.21
-update_url="https://www.kraxel.org/releases/$name/"
 
 dlextract "https://www.kraxel.org/releases/$name/$name-$version.tar.gz" \
           '6dc125fe160479404147e7bbfc781dbc'
diff --git a/satellites/webkit2gtk.sat b/satellites/webkit2gtk.sat
index 30342ff..dd9d687 100644
--- a/satellites/webkit2gtk.sat
+++ b/satellites/webkit2gtk.sat
@@ -2,7 +2,6 @@ import 'compile/cmake'
 
 name=webkitgtk
 version=2.16.6
-update_url='https://webkitgtk.org/'
 
 dlextract "https://webkitgtk.org/releases/$name-$version.tar.xz" \
           '0e2d142a586e4ff79cf0324f4fdbf20c'
diff --git a/satellites/wine-gecko.sat b/satellites/wine-gecko.sat
index 523bbed..a8cbc02 100644
--- a/satellites/wine-gecko.sat
+++ b/satellites/wine-gecko.sat
@@ -2,8 +2,6 @@
 
 name=wine
 version=2.47
-update_url="http://dl.winehq.org/$name/$name-gecko/"
-update_names="<a href=\"$version/\"><img src=\"/share/theme/icons/folder.png\" alt=\"[DIR]\" />"
 
 dlfile "http://dl.winehq.org/$name/$name-gecko/$version/${name}_gecko-$version-x86.msi" \
        '5ebc4ec71c92b3db3d84b334a1db385d'
diff --git a/satellites/wine-mono.sat b/satellites/wine-mono.sat
index c92cfb0..26a1ba8 100644
--- a/satellites/wine-mono.sat
+++ b/satellites/wine-mono.sat
@@ -2,8 +2,6 @@
 
 name=wine
 version=4.7.1
-update_url="http://dl.winehq.org/$name/$name-mono/"
-update_names="<a href=\"$version/\"><img src=\"/share/theme/icons/folder.png\" alt=\"[DIR]\" />"
 
 dlfile "http://dl.winehq.org/$name/$name-mono/$version/$name-mono-$version.msi" \
        '844ae4134e6df71f23dbb222076c37a6'
diff --git a/satellites/wine.sat b/satellites/wine.sat
index 45a807d..73a625a 100644
--- a/satellites/wine.sat
+++ b/satellites/wine.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=wine
 version=2.21
-update_url='https://www.winehq.org/'
-update_names="/announce/$version\""
 
 define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here'
 
diff --git a/satellites/xcb-util-xrm.sat b/satellites/xcb-util-xrm.sat
index 2059380..5a21b62 100644
--- a/satellites/xcb-util-xrm.sat
+++ b/satellites/xcb-util-xrm.sat
@@ -2,7 +2,6 @@ import 'compile/configure'
 
 name=xcb-util-xrm
 version=1.2
-update_url="https://github.com/Airblader/$name/releases"
 
 dlextract "https://github.com/Airblader/$name/releases/download/v$version/$name-$version.tar.bz2" \
           '242dfd4af757fc5ca0e952a714b9606a'
diff --git a/satellites/xclip.sat b/satellites/xclip.sat
index ce4ba46..81f2b0f 100644
--- a/satellites/xclip.sat
+++ b/satellites/xclip.sat
@@ -2,8 +2,6 @@ import 'compile/configure'
 
 name=xclip
 version=0.13
-update_url="https://github.com/astrand/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/astrand/$name/archive/$version/$name-$version.tar.gz" \
           '81e49f56288f299e3389a019f2550ad2'
diff --git a/satellites/yajl.sat b/satellites/yajl.sat
index 2b28aa3..b5794a3 100644
--- a/satellites/yajl.sat
+++ b/satellites/yajl.sat
@@ -2,8 +2,6 @@ import 'compile/cmake'
 
 name=yajl
 version=2.1.0
-update_url="https://github.com/lloyd/$name/releases"
-update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/lloyd/$name/archive/$version/$name-$version.tar.gz" \
           '6887e0ed7479d2549761a4d284d3ecb0'
diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat
index 1d42b16..4c5ac43 100644
--- a/satellites/youtube-dl.sat
+++ b/satellites/youtube-dl.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=youtube-dl
 version=2018.01.07
-update_url="http://rg3.github.io/$name/download.html"
 
 dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \
           '49ef4d7c3522eadad4fc57b8c47b4c6d'
diff --git a/satellites/zim.sat b/satellites/zim.sat
index 693dbe7..9761bb7 100644
--- a/satellites/zim.sat
+++ b/satellites/zim.sat
@@ -2,7 +2,6 @@ import 'compile/python'
 
 name=zim
 version=0.67
-update_url='http://zim-wiki.org/downloads/'
 
 dlextract "http://zim-wiki.org/downloads/$name-$version.tar.gz" \
           'e87975727f1166c723912c949bea51f2'