diff --git a/templates b/templates
index 0826b42b..60afedb6 100755
--- a/templates
+++ b/templates
@@ -1822,226 +1822,6 @@
                                     },
                       test_suite => { name => "cloud_autocloud" },
                     },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 61,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "Workstation-live-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 62,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "Server-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 62,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "Server-dvd-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 62,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "Everything-boot-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 67,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "KDE-live-iso",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_default" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 82,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_package_set_minimal" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 72,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_repository_http_graphical" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 72,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_scsi_updates_img" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 82,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_simple_encrypted" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 82,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_software_raid" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 92,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_btrfs" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 92,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_ext3" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 92,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_lvmthin" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 93,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_blivet_ext3" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 93,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_blivet_btrfs" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 93,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_blivet_no_swap" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 93,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_blivet_xfs" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 93,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_blivet_software_raid" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 93,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_blivet_lvmthin" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 92,
-                      product    => {
-                                      arch    => "i386",
-                                      distri  => "fedora",
-                                      flavor  => "universal",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "install_package_set_kde" },
-                    },
                     {
                       group_name => "Fedora PowerPC",
                       machine    => { name => "ppc64le" },
@@ -4385,72 +4165,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "universal",
-                      name      => "",
-                      settings  => [
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "Everything-boot-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "Server-boot-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "Server-dvd-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "Workstation-live-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "LIVE", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "DESKTOP", value => "gnome" },
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "KDE-live-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "LIVE", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "DESKTOP", value => "kde" },
-                        { key => "TEST_TARGET", value => "ISO" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "arm",
                       distri    => "fedora",