diff --git a/debian/changelog b/debian/changelog
index fa08532..c390e0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,17 +7,10 @@ ubuntu-dev-tools (0.2) UNRELEASED; urgency=low
     licenses require.
 
   [ Luke Yelavich ]
-  * ubuntu-cd:
-    - Ensure correct flavours are chosen for edubuntu, and ubuntu-server
-    - Add support for gobuntu.
-  * ubuntu-sync:
-    - Ensure that powerpc isos are retrieved from the ports directory of
-      the appropriate origin.
-    - Ensure correct flavours are chosen for edubuntu, and
-      ubuntu-server.
-    - Add support for gobuntu.
+  * Removed ubuntu-cd and ubuntu-sync. They are currently undergoing
+    major reworking, and will be re-included when ready.
 
- -- Luke Yelavich <themuso@ubuntu.com>  Thu, 12 Jul 2007 16:38:54 +1000
+ -- Luke Yelavich <themuso@ubuntu.com>  Sat,  4 Aug 2007 08:30:01 +1000
 
 ubuntu-dev-tools (0.1) gutsy; urgency=low
 
diff --git a/ubuntu-cd b/ubuntu-cd
deleted file mode 100755
index 74cb526..0000000
--- a/ubuntu-cd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-set -e
-
-# Get the latest CD snapshot release.
-Distro="$1"
-if [ -z "$Distro" ]; then
-	echo "Which distro?" >&2
-	exit 1
-fi
-Release="$2"
-if [ -z "$Release" ]; then
-	echo "Which ISO release?" >&2
-	exit 1
-fi
-Ver=gutsy
-Code=tribe
-
-cd ~/distros/ubuntu/"${Distro}"/"${Ver}"
-mkdir -p "${Code}"-"${Release}"
-cd "${Code}"-"${Release}"
-
-cp ../*.iso . || true
-
-if [ "${Distro}" == "ubuntu" ]; then
-	Origin="releases"
-	Flavors="alternate desktop server"
-	Archs="i386"
-	#Archs="i386 amd64 powerpc"
-elif [ "${Distro}" == "edubuntu" ]; then
-	Origin="${Distro}/releases"
-	Flavors="desktop server serveraddon"
-	Archs="i386"
-	#Archs="i386 amd64"
-elif [ "${Distro}" == "ubuntu-server" ]; then
-	Origin="releases"
-	Flavors="server"
-	Archs="i386"
-	#Archs="i386 amd64"
-elif [ "${Distro}" == "gobuntu" ]; then
-        Origin="${Distro}/releases"
-        Flavors="alternate"
-        Archs="i386"
-        #Archs="i386 amd64 powerpc"
-else
-	Origin="${Distro}/releases"
-	Flavors="alternate desktop"
-	Archs="i386"
-	#Archs="i386 amd64"
-fi
-
-for arch in $Archs; do
-	for flavor in $Flavors; do
-		rsync "rsync://cdimage.ubuntu.com/cdimage/${Origin}/${Ver}/${Code}-${Release}/${Ver}-${flavor}-${arch}.iso" "${Ver}-${flavor}-${arch}.iso"
-	done
-done
diff --git a/ubuntu-sync b/ubuntu-sync
deleted file mode 100755
index e16fac7..0000000
--- a/ubuntu-sync
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-set -e
-
-# Syncronise new ubuntu CD images, depending on command-line flags given.
-# If none are given, sync all images.
-
-if [ -e /tmp/ubuntu-sync.01532-lock ]; then
-	echo "Another copy of the script is running."
-	exit 1
-fi
-
-Ubuntu_Distro_Dir="$HOME/distros/ubuntu"
-Dist=gutsy
-
-# Only sync the oldest images, and only i386 images if low bandwidth.
-Low_Bandwidth=0
-
-while [ -n "$1" ]; do
-	case "$1" in
-		-u)
-			Image_Sets="${Image_Sets} ubuntu"
-			break
-		;;
-		-k)
-			Image_Sets="${Image_Sets} kubuntu"
-			break
-		;;
-		-e)
-			Image_Sets="${Image_Sets} edubuntu"
-			break
-		;;
-		-x)
-			Image_Sets="${Image_Sets} xubuntu"
-			break
-		;;
-		-g)
-			Image_Sets="${Image_Sets} gobuntu"
-			break
-		;;
-		-s)
-			Image_Sets="${Image_Sets} ubuntu-server"
-			break
-		;;
-	esac
-	shift || true
-done
-if [ "${Low_Bandwidth}" == 1 ] && [ "${Image_Sets}" == "" ]; then
-	cd "${Ubuntu_Distro_Dir}"
-	Image_Sets=`ls -td1 */"${Dist}" | tail -1 | cut -f 1 -d /`
-elif [ "${Low_Bandwidth}" == 0 ] && [ "${Image_Sets}" == "" ]; then
-	Image_Sets="ubuntu xubuntu ubuntu-server edubuntu kubuntu gobuntu"
-fi
-
-# Sync images.
-if [ ! -e /tmp/ubuntu-sync.01532-lock ]; then
-        touch /tmp/ubuntu-sync.01532-lock
-fi
-for Current_Set in ${Image_Sets}
-do
-	mkdir -p "${Ubuntu_Distro_Dir}/${Current_Set}/${Dist}"/.partial
-	cd "${Ubuntu_Distro_Dir}/${Current_Set}/${Dist}"
-
-	# Figure out remote path
-	if [ "${Current_Set}" == "ubuntu" ]; then
-		Origin=""
-	else
-		Origin="${Current_Set}"
-	fi
-	
-	# Which flavors to download
-	if [ "${Current_Set}" == "edubuntu" ]; then
-		Flavors="desktop server serveraddon"
-	elif [ "${Current_Set}" == "ubuntu-server" ]; then
-		Flavors="server"
-	elif [ "${Current_Set}" == "gobuntu" ]; then
-		Flavors="alternate"
-	else
-		Flavors="alternate desktop"
-	fi
-
-	# Which archs to download
-	if [ "${Low_Bandwidth}" == 0 ]; then
-		Archs="i386 powerpc"
-		#Archs="i386 amd64 powerpc"
-	else
-		Archs="i386"
-	fi
-
-	for arch in $Archs; do
-		for flavor in $Flavors; do
-			if [ "${flavor}" == "desktop" ]; then
-				Is_Desktop=-live
-			fi
-			if [ "${arch}" == "powerpc" ]; then
-				Is_Ports=ports
-			fi
-			if rsync --partial-dir="${Ubuntu_Distro_Dir}/${Current_Set}/${Dist}/.partial" "rsync://cdimage.ubuntu.com/cdimage/${Origin}/${Is_Ports}/daily${Is_Desktop}/current/${Dist}-${flavor}-${arch}.iso" "${Dist}-${flavor}-${arch}.iso" ; then
-			        date > "${flavor}-${arch}-sync"
-			fi
-			unset Is_Desktop
-			unset Is_Ports
-		done
-	done
-done
-rm /tmp/ubuntu-sync.01532-lock