3 files changed, 3 insertions, 23 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml
index 5f9a7645..44a203a2 100644
--- a/data/architectures/amd64.toml
+++ b/data/architectures/amd64.toml
@@ -14,6 +14,4 @@ packages = [
   "vyos-intel-ixgbevf",
   "mlnx-ofed-kernel-modules",
   "mlnx-tools",
-  "openvpn-dco",
-  "telegraf"
 ]
diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml
index ff95d0cf..22f1fd10 100644
--- a/data/architectures/arm64.toml
+++ b/data/architectures/arm64.toml
@@ -5,5 +5,7 @@ additional_repositories = [
 kernel_flavor = "arm64-vyos"
 
 # Packages included in ARM64 images by default
-packages = ["grub-efi-arm64", "openvpn-dco"]
+packages = [
+  "grub-efi-arm64",
+]
 bootloaders = "grub-efi"
diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
deleted file mode 100644
index 49f4afc4..00000000
--- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry
+++ /dev/null
@@ -1,20 +0,0 @@
-menuentry "VyOS  (KVM console)" {
-        linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0
-        initrd /boot//initrd.img
-}
-
-menuentry "VyOS  (Serial console)" {
-        linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200
-        initrd /boot//initrd.img
-}
-
-menuentry "Lost password change  (KVM console)" {
-        linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset
-        initrd /boot//initrd.img
-}
-
-menuentry "Lost password change  (Serial console)" {
-        linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset
-        initrd /boot//initrd.img
-}
-