diff --git a/jeos/F18-i386-cfntools.tdl b/jeos/F18-i386-cfntools.tdl
deleted file mode 100644
index 39814b51..00000000
--- a/jeos/F18-i386-cfntools.tdl
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <name>F18-i386-cfntools</name>
-  <os>
-    <name>Fedora</name>
-    <version>18</version>
-    <arch>i386</arch>
-    <install type='iso'>
-      <iso>file:/var/lib/libvirt/images/Fedora-18-i386-netinst.iso</iso>
-    </install>
-  </os>
-  <description>Fedora 18</description>
-  <commands>
-    <command name='lockroot'> 
-passwd -l root
-    </command>
-    <command name='packages'>
-yum -y update fedora-release
-yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip python-boto
-yum -y update
-sed --in-place -e s/Type=oneshot/"Type=oneshot\nTimeoutSec=0"/ /lib/systemd/system/cloud-final.service
-pip-python install heat-cfntools
-cfn-create-aws-symlinks --source /usr/bin
-
-    </command>
-  </commands>
-</template>
diff --git a/jeos/F18-x86_64-cfntools.tdl b/jeos/F18-x86_64-cfntools.tdl
deleted file mode 100644
index 9f8202b5..00000000
--- a/jeos/F18-x86_64-cfntools.tdl
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <name>F18-x86_64-cfntools</name>
-  <os>
-    <name>Fedora</name>
-    <version>18</version>
-    <arch>x86_64</arch>
-    <install type='iso'>
-      <iso>file:/var/lib/libvirt/images/Fedora-18-x86_64-netinst.iso</iso>
-    </install>
-  </os>
-  <description>Fedora 18</description>
-  <commands>
-    <command name='lockroot'> 
-passwd -l root
-    </command>
-    <command name='packages'>
-yum -y update fedora-release
-yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip python-boto
-yum -y update
-sed --in-place -e s/Type=oneshot/"Type=oneshot\nTimeoutSec=0"/ /lib/systemd/system/cloud-final.service
-pip-python install heat-cfntools
-cfn-create-aws-symlinks --source /usr/bin
-
-    </command>
-  </commands>
-</template>