diff --git a/build-devkit.sh b/build-devkit.sh
index 2fbe8c6..949ad74 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -41,9 +41,7 @@ GRIT_VER=0.8.12
 NDSTOOL_VER=1.50.1
 GENERAL_TOOLS_VER=1.0.0
 DLDITOOL_VER=1.24.0
-GXTEXCONV_VER=0.1.9
-GCDSPSUITE_VER=1.4.0
-ELF2DOL_VER=1.0.0
+GAMECUBE_TOOLS_VER=1.0.0
 WIILOAD_VER=0.5.1
 MMUTIL_VER=1.8.6
 DFU_UTIL_VER=0.7.1
@@ -205,8 +203,7 @@ fi
 
 if [ $VERSION -eq 2 ]; then
 	targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
-	hostarchives="gxtexconv-$GXTEXCONV_VER.tar.bz2 gcdspsuite-$GCDSPSUITE_VER.tar.bz2
-			wiiload-$WIILOAD_VER.tar.bz2 elf2dol-$ELF2DOL_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
+	hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
 fi
 
 if [ $VERSION -eq 3 ]; then
diff --git a/config.sh.sample b/config.sh.sample
index 3c269e7..fd2d1c8 100644
--- a/config.sh.sample
+++ b/config.sh.sample
@@ -13,15 +13,6 @@
 #---------------------------------------------------------------------------------
 BUILD_DKPRO_PACKAGE=0
 
-#---------------------------------------------------------------------------------
-# Download source packages
-#---------------------------------------------------------------------------------
-#   0: User selects manually
-#   1: already downloaded
-#   2: download packages
-#---------------------------------------------------------------------------------
-BUILD_DKPRO_DOWNLOAD=0
-
 #---------------------------------------------------------------------------------
 # Toolchain installation directory, comment if not specified
 #---------------------------------------------------------------------------------
@@ -36,7 +27,7 @@ BUILD_DKPRO_DOWNLOAD=0
 #---------------------------------------------------------------------------------
 # Automated script execution
 #---------------------------------------------------------------------------------
-#  0: Ask to delete build folders & patched sources 
-#  1: Use defaults, don't pause for answers 
+#  0: Ask to delete build folders & patched sources
+#  1: Use defaults, don't pause for answers
 #---------------------------------------------------------------------------------
 BUILD_DKPRO_AUTOMATED=0