diff --git a/core/src/main/resources/template/css_xhtml/datetimepicker.ftl b/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
deleted file mode 100644
index 7cb38efef..000000000
--- a/core/src/main/resources/template/css_xhtml/datetimepicker.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
-<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
-<#nt/>
\ No newline at end of file
diff --git a/core/src/main/resources/template/xhtml/autocompleter.ftl b/core/src/main/resources/template/xhtml/autocompleter.ftl
deleted file mode 100644
index 0bd1028cd..000000000
--- a/core/src/main/resources/template/xhtml/autocompleter.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/${themeProperties.parent}/autocompleter.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
diff --git a/core/src/main/resources/template/xhtml/datepicker.ftl b/core/src/main/resources/template/xhtml/datepicker.ftl
deleted file mode 100644
index c5b9b40dd..000000000
--- a/core/src/main/resources/template/xhtml/datepicker.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/simple/datepicker.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-
diff --git a/core/src/main/resources/template/xhtml/datetimepicker.ftl b/core/src/main/resources/template/xhtml/datetimepicker.ftl
deleted file mode 100644
index cbcbaae4c..000000000
--- a/core/src/main/resources/template/xhtml/datetimepicker.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-
diff --git a/core/src/main/resources/template/xhtml/timepicker.ftl b/core/src/main/resources/template/xhtml/timepicker.ftl
deleted file mode 100644
index 3a905d4b4..000000000
--- a/core/src/main/resources/template/xhtml/timepicker.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/simple/timepicker.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-