diff --git a/templates/delete/system/image/node.def b/templates/delete/system/image/node.def
deleted file mode 100644
index 1d116e24..00000000
--- a/templates/delete/system/image/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Remove an installed image from the system
-run: sudo /opt/vyatta/bin/vyatta-boot-image.pl --delete
diff --git a/templates/delete/system/image/node.tag/node.def b/templates/delete/system/image/node.tag/node.def
deleted file mode 100644
index 403bd804..00000000
--- a/templates/delete/system/image/node.tag/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Name of image image to delete
-
-allowed:
-	local -a images ;
-	images=`/opt/vyatta/bin/vyatta-boot-image.pl --list`
-	echo -n $images
-
-run:
-	image=$4
-	sudo /opt/vyatta/bin/vyatta-boot-image.pl --del $image
diff --git a/templates/delete/system/node.def b/templates/delete/system/node.def
deleted file mode 100644
index 952e7782..00000000
--- a/templates/delete/system/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Delete system objects
diff --git a/templates/install/image/node.def b/templates/install/image/node.def
deleted file mode 100644
index e229319d..00000000
--- a/templates/install/image/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Install new system image to hard drive
-run: sudo /opt/vyatta/sbin/install-image
diff --git a/templates/install/node.def b/templates/install/node.def
deleted file mode 100644
index a52b6068..00000000
--- a/templates/install/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Install a new system
diff --git a/templates/rename/node.def b/templates/rename/node.def
deleted file mode 100644
index 9bbaa035..00000000
--- a/templates/rename/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help:  Rename an object
diff --git a/templates/rename/system/image/node.def b/templates/rename/system/image/node.def
deleted file mode 100644
index 00e9c818..00000000
--- a/templates/rename/system/image/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Re-name a system image.
diff --git a/templates/rename/system/image/node.tag/node.def b/templates/rename/system/image/node.tag/node.def
deleted file mode 100644
index eb25deff..00000000
--- a/templates/rename/system/image/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: System image to rename.
-
-allowed:
-        local -a images ;
-        images=`/opt/vyatta/bin/vyatta-boot-image.pl --list`
-        echo -n $images
diff --git a/templates/rename/system/image/node.tag/node.tag/node.def b/templates/rename/system/image/node.tag/node.tag/node.def
deleted file mode 100644
index 1f94c572..00000000
--- a/templates/rename/system/image/node.tag/node.tag/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: New name for system image.
-
-run:
-        old=$4
-	new=$5
-        sudo /opt/vyatta/bin/rename-image.pl --old_name $old --new_name $new
-
diff --git a/templates/rename/system/node.def b/templates/rename/system/node.def
deleted file mode 100644
index 1d86fc2a..00000000
--- a/templates/rename/system/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Re-name a system object.
diff --git a/templates/set/node.def b/templates/set/node.def
deleted file mode 100644
index e47b8932..00000000
--- a/templates/set/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set operational options
diff --git a/templates/set/system/image/default-boot/node.def b/templates/set/system/image/default-boot/node.def
deleted file mode 100644
index b0e32905..00000000
--- a/templates/set/system/image/default-boot/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Set default image to boot.
-
-run:
-        sudo /opt/vyatta/bin/vyatta-boot-image.pl --select
diff --git a/templates/set/system/image/default-boot/node.tag/node.def b/templates/set/system/image/default-boot/node.tag/node.def
deleted file mode 100644
index 9a37a55b..00000000
--- a/templates/set/system/image/default-boot/node.tag/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Default boot image name
-
-allowed:
-	local -a images ;
-	images=`/opt/vyatta/bin/vyatta-boot-image.pl --list`
-	echo -n $images
-
-run:
-	image=$5
-	sudo /opt/vyatta/bin/vyatta-boot-image.pl --select $image
diff --git a/templates/set/system/image/node.def b/templates/set/system/image/node.def
deleted file mode 100644
index c6d0f341..00000000
--- a/templates/set/system/image/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set system image parameters
diff --git a/templates/set/system/node.def b/templates/set/system/node.def
deleted file mode 100644
index eef577c0..00000000
--- a/templates/set/system/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set system operational parameters
diff --git a/templates/show/system/image/node.def b/templates/show/system/image/node.def
deleted file mode 100644
index 0766094b..00000000
--- a/templates/show/system/image/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show installed VyOS images
-run: /opt/vyatta/bin/vyatta-boot-image.pl --show
diff --git a/templates/show/system/image/storage/node.def b/templates/show/system/image/storage/node.def
deleted file mode 100644
index 5dfd1932..00000000
--- a/templates/show/system/image/storage/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show disk space utilization of system images
-
-run: sudo /opt/vyatta/bin/show-image-storage.pl
diff --git a/templates/show/system/image/version/node.def b/templates/show/system/image/version/node.def
deleted file mode 100644
index 0da3c7b0..00000000
--- a/templates/show/system/image/version/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show installed VyOS images with version number
-run: /opt/vyatta/bin/vyatta-boot-image.pl --show --show_vers