diff --git a/btv b/btv
index 206c75c..d2348b1 100755
--- a/btv
+++ b/btv
@@ -8,7 +8,6 @@ import datetime
 import json
 import os
 import shlex
-import shutil
 import sys
 import time
 import socket
@@ -199,9 +198,9 @@ def serialize(snap, outdir, key, snap_from=None):
 	## prepare directories
 	##
 	if snap_from:
-		name = "%s to %s" %(snap_from.name, snap.name)
+		name = "%s diff from %s" %(snap.name, snap_from.name)
 	else:
-		name = snap.name
+		name = "%s full" %(snap.name)
 	
 	directory = os.path.join(outdir, name)
 	os.makedirs(directory)
@@ -247,15 +246,11 @@ def serialize(snap, outdir, key, snap_from=None):
 	## final touches
 	##
 	
-	## add self-check and unpack executables
+	## add a self-check executable
 	with open(os.path.join(directory, "check-integrity.sh"), "w") as f:
 		f.write("#! /bin/sh\n\nsha512sum --check manifest.sha512\n")
 		os.chmod(f.name, 0o500)
 	
-	unpack_path = os.path.join(directory, "unpack.sh")
-	shutil.copy("/usr/share/btv/unpack.sh", unpack_path)
-	os.chmod(unpack_path, 0o500)
-	
 	## fix permissions and ownership of created objects
 	outdir_stat = os.stat(outdir)
 	os.chown(directory, outdir_stat.st_uid, outdir_stat.st_gid)
diff --git a/unpack.sh b/unpack.sh
deleted file mode 100644
index f78a8ba..0000000
--- a/unpack.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/zsh
-
-TIMESTAMP=($(basename "$(pwd)"))
-OUTDIR="$1"
-KEYFILE="$2"
-
-function die {
-	>&2 echo "$2"
-	exit $1
-}
-
-[[ "$0" != "./unpack.sh" ]] && die 1 "This can only be executed from the snapshot directory itself."
-[[ ! -d "$OUTDIR" ]]       && die 1 "The first argument must be a directory to unpack subvolumes into."
-[[ ! -f "$KEYFILE" ]]      && die 1 "The second argument must be a readable keyfile."
-./check-integrity.sh       || die 2 "This snapshot failed integrity checks."
-
-### end of checks
-
-for ARCHIVE in *btrfs.zst.aes
-do
-	openssl enc -d -aes-256-cbc -pbkdf2 -salt -pass "file:$KEYFILE" < "$ARCHIVE" | zstd -d | btrfs receive "$OUTDIR" || die 3 "Failed to unpack subvolume."
-	SUBVOL_NAME=${ARCHIVE%%.btrfs.zst.aes}
-	mv "${OUTDIR}/${SUBVOL_NAME}" "${OUTDIR}/${SUBVOL_NAME}.${TIMESTAMP[1]}" || die 4 "Failed to rename subvolume."
-done