diff --git a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
index 4100571..c78ff0b 100755
--- a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
@@ -439,6 +439,15 @@ case "$ACTION" in
 		log_msg "Rebooting the CryptoBox ..."
 		echo "reboot" | at now
 		;;
+	clean )
+		# only for development
+		log_msg "Cleaning the CryptoBox ..."
+		device=$(find_harddisk)
+		$0 crypto-down
+		$0 config-down
+		# TODO: test this!
+		echo -e ";\n;\n;\n;\n" | $SFDISK "$device"
+		;;
 	* )
 		echo "Syntax: `basename $0` ACTION [PARAMS]"
 		echo "  config-up		- scan for configuration partition and mount it"
@@ -462,6 +471,7 @@ case "$ACTION" in
 		echo "  get_config NAME	- retrieve a configuration setting"
 		echo "  diskinfo		- show the partition table of the harddisk"
 		echo "  poweroff		- shutdown the cryptobox"
+		echo "	clean		- remove all partitions [only for development]"
 		echo "  reboot		- reboot the cryptobox"
 		echo
 		;;
diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/language b/cbox-tree.d/usr/share/cryptobox/defaults/language
index 7673daa..c574d07 100644
--- a/cbox-tree.d/usr/share/cryptobox/defaults/language
+++ b/cbox-tree.d/usr/share/cryptobox/defaults/language
@@ -1 +1 @@
-de
+en