diff --git a/site.cfg b/site.cfg
index e41c0b5c..8ab7af0d 100644
--- a/site.cfg
+++ b/site.cfg
@@ -7,13 +7,6 @@
 # Configuration settings for SQLite
 database: sqlite
 driver: dbi:SQLite:hpr.db 
-#user:        (not used - leave blank)
-#password:    (not used - leave blank)
-# Configuration settings for MySQL
-#database: mysql
-#driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
-#user: hpr-generator  (Suggested user with read-only privileges)
-#password: *********  (Password for user)
 
 # Configure the location of the templates and the generated HTML
 [app_paths]
diff --git a/templates/content-comments_viewer.tpl.html b/templates/content-comments_viewer.tpl.html
index 509b6176..27949258 100644
--- a/templates/content-comments_viewer.tpl.html
+++ b/templates/content-comments_viewer.tpl.html
@@ -1,8 +1,9 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-listen-now.tpl.html' %-->
-<!--% PROCESS "queries-episode-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PROCESS "queries-episode.tpl.html" %-->
+<!--% USE DBI(constants.driver) %-->
+
 <h2>Comment Viewer</h2>
 <p>Because of the spammers we have had to turn on comment moderation. Sorry about the delay this will cause.</p>
 <p><a href="<!--% absolute_path(baseurl) %-->comments.rss">Subscribe</a> to the comment feed.</p>
diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index 537fab4c..e534255f 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -1,8 +1,8 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-correspondent-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PROCESS "queries-correspondent.tpl.html" %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% results_hpr_shows = DBI.prepare(query_hpr_shows)
 %-->
 <!--% results_hpr_show_count = DBI.prepare(query_hpr_show_count) %-->
diff --git a/templates/content-correspondents.tpl.html b/templates/content-correspondents.tpl.html
index fd682379..f4923be3 100644
--- a/templates/content-correspondents.tpl.html
+++ b/templates/content-correspondents.tpl.html
@@ -3,7 +3,7 @@
 <article>
 	<h2 class="title">Correspondents</h2>
 	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_url(baseurl) %-->about.html#so_you_want_to_record_a_podcast">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% host_cnt = 0 %-->
 	<table class="hosts">
 	<th >Avatar</th>
diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index 9b0c6792..4fc71f11 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -3,7 +3,7 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-listen-now.tpl.html' %-->
 <!--% PROCESS 'shared-show-transcript.tpl.html' %-->
-<!--% PROCESS "queries-episode-${constants.database}.tpl.html" %-->
+<!--% PROCESS "queries-episode.tpl.html" %-->
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 <!--% query_episodes = DBI.prepare(query_episode_maxmin) %-->
 <!--% episode_result = query_episodes.execute(id, id, id, id, id) %-->
diff --git a/templates/content-episodes.tpl.html b/templates/content-episodes.tpl.html
index 322e0a28..45eda531 100644
--- a/templates/content-episodes.tpl.html
+++ b/templates/content-episodes.tpl.html
@@ -1,5 +1,5 @@
  <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
- <!--% PROCESS "queries-episodes-${constants.database}.tpl.html" %-->
+ <!--% PROCESS "queries-episodes.tpl.html" %-->
 <article>
     <header>
         <h1>Complete Archive of Shows.</h1>
@@ -7,7 +7,7 @@
         All this information is available to the public. Scrape if you wish but if we can format the data for you then we're happy to help.
         </p>
     </header>
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% FOREACH episodes IN DBI.query(query_episodes) 
 %-->
 	<!--% show_summary(episodes) %-->
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index a6314650..08793185 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -4,7 +4,7 @@
 <!--% PROCESS 'shared-show-transcript.tpl.html' %-->
 <!--% PROCESS 'shared-call_for_shows.tpl.html' %-->
 <!--% INCLUDE 'content-index-announcement.tpl.html' %-->
-<!--% PROCESS "queries-index-${constants.database}.tpl.html" %-->
+<!--% PROCESS "queries-index.tpl.html" %-->
 <!--% MACRO tidy_notes(all_lines) BLOCK %-->
 <!--% lines = all_lines %-->
 <!--% after_html = all_lines %-->
@@ -29,7 +29,7 @@
         <h3>Welcome to HPR, the Community Podcast</h3>
     </header>
 	<!--% days_till_next_episode = 0 %-->
-	<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+	<!--% USE DBI(constants.driver) %-->
 	<!--% USE date %-->
 	<!--% calc = date.calc %-->
 	<!--% episodes = DBI.query(query_next_available_episode).get_all() %-->
diff --git a/templates/content-series.tpl.html b/templates/content-series.tpl.html
index 07183911..797ce9d5 100644
--- a/templates/content-series.tpl.html
+++ b/templates/content-series.tpl.html
@@ -1,7 +1,7 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-series-${constants.database}.tpl.html" %-->
+<!--% PROCESS "queries-series.tpl.html" %-->
   <article>
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <h1 class="title">In-Depth Series</h1>
 <!--% FOREACH series IN DBI.query(query_episodes) %-->
 	<h2><a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series.id) %-->.html"><!--% series.name %--></a></h2>
diff --git a/templates/content-series_episode.tpl.html b/templates/content-series_episode.tpl.html
index f1e2ecdd..eea11de6 100644
--- a/templates/content-series_episode.tpl.html
+++ b/templates/content-series_episode.tpl.html
@@ -1,7 +1,7 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
-<!--% PROCESS "queries-series_episodes-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PROCESS "queries-series_episodes.tpl.html" %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% query_series = DBI.prepare(query_series_sql)
 %-->
 <!--% series_result = query_series.execute(id) %-->
diff --git a/templates/content-tags.tpl.html b/templates/content-tags.tpl.html
index d56b9b5f..13a9dd32 100644
--- a/templates/content-tags.tpl.html
+++ b/templates/content-tags.tpl.html
@@ -1,6 +1,6 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-tags-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PROCESS "queries-tags.tpl.html" %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% PERL %-->
 $Template::Stash::PRIVATE = undef; # Allow . in tag
 <!--% END %-->
diff --git a/templates/content-twat_episode.tpl.html b/templates/content-twat_episode.tpl.html
index 52b0340a..a5607407 100644
--- a/templates/content-twat_episode.tpl.html
+++ b/templates/content-twat_episode.tpl.html
@@ -2,7 +2,7 @@
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-listen-now.tpl.html' %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% query_episodes = DBI.prepare('
 		WITH episode_maxmin AS (
 					SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
diff --git a/templates/ids-correspondent.tpl.html b/templates/ids-correspondent.tpl.html
index fc600434..af066813 100644
--- a/templates/ids-correspondent.tpl.html
+++ b/templates/ids-correspondent.tpl.html
@@ -1,4 +1,4 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% FOREACH host IN DBI.query(
 	'select h.hostid from hosts as h'
 ) %-->
diff --git a/templates/ids-episode.tpl.html b/templates/ids-episode.tpl.html
index c4df5aba..82bb1c7e 100644
--- a/templates/ids-episode.tpl.html
+++ b/templates/ids-episode.tpl.html
@@ -1,5 +1,5 @@
-<!--% PROCESS "queries-ids-episode-${constants.database}.tpl.html" %-->
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% PROCESS "queries-ids-episode.tpl.html" %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% FOREACH episode IN DBI.query(query_ids_episode) %-->
 ,<!--% episode.id %-->
 <!--% END %-->
diff --git a/templates/ids-twat_episode.tpl.html b/templates/ids-twat_episode.tpl.html
index d7eaa0c1..9616fe65 100644
--- a/templates/ids-twat_episode.tpl.html
+++ b/templates/ids-twat_episode.tpl.html
@@ -1,4 +1,4 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% FOREACH episode IN DBI.query(
 	'select eps.id from twat_eps AS eps'
 ) %-->
diff --git a/templates/queries-call_for_shows-mysql.tpl.html b/templates/queries-call_for_shows-mysql.tpl.html
deleted file mode 100644
index 9f67a7ad..00000000
--- a/templates/queries-call_for_shows-mysql.tpl.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!--% query_call_for_shows = '
-	SELECT CASE WHEN COUNT(id) < 6 THEN True ELSE False END AS `request_for_shows`
-	FROM eps
-	WHERE eps.date > NOW() AND eps.date <= DATE_ADD(NOW(), INTERVAL 10 DAY)
-	'
-%-->
diff --git a/templates/queries-call_for_shows-sqlite.tpl.html b/templates/queries-call_for_shows.tpl.html
similarity index 100%
rename from templates/queries-call_for_shows-sqlite.tpl.html
rename to templates/queries-call_for_shows.tpl.html
diff --git a/templates/queries-correspondent-mysql.tpl.html b/templates/queries-correspondent-mysql.tpl.html
deleted file mode 100644
index 6f3de33f..00000000
--- a/templates/queries-correspondent-mysql.tpl.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--% query_hpr_shows = '
-	SELECT
-		eps.id,
-		eps.explicit,
-		eps.date, eps.license, eps.duration,
-		eps.title, eps.summary, eps.tags,
-		eps.notes,
-		hosts.local_image,
-		hosts.hostid,
-		hosts.host, hosts.email, hosts.profile,
-		miniseries.name AS series, miniseries.id AS seriesid
-	FROM eps
-	INNER JOIN hosts ON eps.hostid = hosts.hostid
-	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE hosts.hostid = ? AND eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-	ORDER BY eps.id DESC
-	'
-%-->
-<!--% query_hpr_show_count = '
-	SELECT id
-	FROM eps
-	WHERE eps.hostid = ? AND eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-	'
-%-->
diff --git a/templates/queries-correspondent-sqlite.tpl.html b/templates/queries-correspondent.tpl.html
similarity index 100%
rename from templates/queries-correspondent-sqlite.tpl.html
rename to templates/queries-correspondent.tpl.html
diff --git a/templates/queries-episode-mysql.tpl.html b/templates/queries-episode-mysql.tpl.html
deleted file mode 100644
index c99df5e7..00000000
--- a/templates/queries-episode-mysql.tpl.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--% query_episode_maxmin = '
-		WITH episode_maxmin AS (
-			SELECT MAX(id) AS \'latest\', MIN(id) AS \'earliest\', ? AS \'id\' 
-			FROM eps
-			WHERE eps.date <= UTC_DATE()
-		),
-		episode_date AS (
-			SELECT eps.date 
-			FROM eps
-			WHERE eps.id = ?
-		),
-		episode_previous AS (
-			SELECT MAX(id) AS \'previous\', ? AS \'id\'
-			FROM eps
-			INNER JOIN episode_date
-			ON eps.date < episode_date.date
-			WHERE eps.id > 1
-		),
-		episode_next AS (
-			SELECT MIN(id) AS \'next\', ? AS \'id\'
-			FROM eps
-			INNER JOIN episode_date
-				ON eps.date > episode_date.date
-			WHERE eps.date <= NOW()
-		),
-		comment_tallies AS (	
-			SELECT 
-				eps_id,
-				COUNT(eps_id) AS eps_tally
-			FROM comments
-			GROUP BY eps_id 
-		)
-		SELECT eps.id, eps.date, eps.title, eps.duration, 
-			   eps.summary, eps.notes, eps.explicit, eps.license, 
-			   eps.tags, eps.version, eps.downloads, eps.valid,
-			   episode_maxmin.latest, episode_maxmin.earliest,
-			   episode_previous.previous, episode_next.next,
-			   hosts.hostid, hosts.host,
-			   miniseries.name AS \'series\', miniseries.id AS \'seriesid\',
-			   miniseries.description AS \'series_description\',
-			   COALESCE (comment_tallies.eps_tally, 0) AS eps_tally 
-		FROM eps
-		INNER JOIN hosts ON eps.hostid = hosts.hostid
-		INNER JOIN miniseries ON eps.series = miniseries.id
-		INNER JOIN episode_maxmin ON eps.id = episode_maxmin.id
-		INNER JOIN episode_previous ON eps.id = episode_previous.id
-		INNER JOIN episode_next ON eps.id = episode_next.id
-		LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
-		WHERE eps.id = ?
-	'
-%-->
diff --git a/templates/queries-episode-sqlite.tpl.html b/templates/queries-episode.tpl.html
similarity index 100%
rename from templates/queries-episode-sqlite.tpl.html
rename to templates/queries-episode.tpl.html
diff --git a/templates/queries-episodes-mysql.tpl.html b/templates/queries-episodes-mysql.tpl.html
deleted file mode 100644
index c381277d..00000000
--- a/templates/queries-episodes-mysql.tpl.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--% query_episodes = 'SELECT 
-        eps.id, 
-        eps.explicit, 
-        eps.date, eps.license, eps.title, eps.summary, 
-		eps.duration, eps.notes, eps.tags,
-        hosts.hostid, 
-        hosts.host, hosts.email, hosts.local_image, 
-		miniseries.name AS series, miniseries.id AS seriesid
-    FROM eps 
-	INNER JOIN hosts ON eps.hostid = hosts.hostid 
-	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE eps.date <= UTC_DATE()
-	ORDER BY eps.id DESC'
-%-->
-
diff --git a/templates/queries-episodes-sqlite.tpl.html b/templates/queries-episodes.tpl.html
similarity index 100%
rename from templates/queries-episodes-sqlite.tpl.html
rename to templates/queries-episodes.tpl.html
diff --git a/templates/queries-ids-episode-sqlite.tpl.html b/templates/queries-ids-episode-sqlite.tpl.html
deleted file mode 100644
index 8b0f68c0..00000000
--- a/templates/queries-ids-episode-sqlite.tpl.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--% query_ids_episode = 'select eps.id from eps order by eps.id' %-->
-
diff --git a/templates/queries-ids-episode-mysql.tpl.html b/templates/queries-ids-episode.tpl.html
similarity index 100%
rename from templates/queries-ids-episode-mysql.tpl.html
rename to templates/queries-ids-episode.tpl.html
diff --git a/templates/queries-index-mysql.tpl.html b/templates/queries-index-mysql.tpl.html
deleted file mode 100644
index e46b4804..00000000
--- a/templates/queries-index-mysql.tpl.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--% query_next_available_episode = '
-    SELECT id, date FROM eps e WHERE id = (
-        SELECT  id + 1 FROM eps mo
-            WHERE NOT EXISTS (
-		SELECT NULL
-		FROM   eps mi
-		WHERE  mi.id = mo.id + 1
-            )
-        ORDER BY id
-        LIMIT 1) - 1
-    '
-%-->
-<!--% query_latest_episodes = '
-	WITH comment_tallies AS (
-		SELECT
-			eps_id,
-			COUNT(eps_id) AS eps_tally
-		FROM comments
-		GROUP BY eps_id
-	)
-	SELECT
-		eps.id,
-		eps.explicit,
-		eps.date, eps.license, eps.duration,
-		eps.title, eps.summary, eps.tags,
-		eps.notes,
-		hosts.local_image,
-		hosts.hostid,
-		hosts.host, hosts.email,
-		miniseries.name AS series, miniseries.id AS seriesid,
-		COALESCE (comment_tallies.eps_tally, 0) AS eps_tally
-	FROM eps
-	INNER JOIN hosts ON eps.hostid = hosts.hostid
-    INNER JOIN miniseries ON eps.series = miniseries.id
-    LEFT JOIN comment_tallies ON eps.id = comment_tallies.eps_id
-	WHERE eps.date <= UTC_DATE()
-	ORDER BY eps.id  DESC
-	LIMIT 10
-	'
-%-->
-<!--% query_last_5_weeks_episodes = '
-	SELECT
-        eps.id,
-	eps.explicit,
-        eps.date, eps.license, eps.title, eps.summary,
-		eps.duration, eps.notes, eps.tags,
-        hosts.hostid,
-        hosts.host, hosts.email, hosts.local_image,
-		miniseries.name AS series, miniseries.id AS seriesid
-    FROM eps
-	INNER JOIN hosts ON eps.hostid = hosts.hostid
-	INNER JOIN miniseries ON eps.series = miniseries.id
-	WHERE eps.date <= UTC_DATE()
-    ORDER BY eps.id  DESC
-	LIMIT 30 OFFSET 10
-	'
-%-->
-
diff --git a/templates/queries-index-sqlite.tpl.html b/templates/queries-index.tpl.html
similarity index 100%
rename from templates/queries-index-sqlite.tpl.html
rename to templates/queries-index.tpl.html
diff --git a/templates/queries-series-mysql.tpl.html b/templates/queries-series-mysql.tpl.html
deleted file mode 100644
index c98f6805..00000000
--- a/templates/queries-series-mysql.tpl.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--% query_episodes = 'SELECT miniseries.id, miniseries.name, miniseries.description, 
-			miniseries.private, miniseries.image, miniseries.valid,
-			ep.number_of_episodes, ep.latest_show, ep.earliest_show
-		FROM miniseries
-		INNER JOIN 
-			(SELECT series, 
-				COUNT(eps.id) AS number_of_episodes,
-				MAX(eps.date) AS latest_show,
-				MIN(eps.date) AS earliest_show
-			 FROM eps 
-			 WHERE eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-			 GROUP BY series) AS ep ON ep.series = miniseries.id
-		ORDER BY name'
-%-->
-
diff --git a/templates/queries-series-sqlite.tpl.html b/templates/queries-series.tpl.html
similarity index 100%
rename from templates/queries-series-sqlite.tpl.html
rename to templates/queries-series.tpl.html
diff --git a/templates/queries-series_episodes-mysql.tpl.html b/templates/queries-series_episodes-mysql.tpl.html
deleted file mode 100644
index ef907da0..00000000
--- a/templates/queries-series_episodes-mysql.tpl.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--% query_series_sql = 'SELECT miniseries.id, miniseries.name, 
-			miniseries.description, 
-			miniseries.private, miniseries.image, miniseries.valid,
-			ep.number_of_episodes, ep.latest_show, ep.earliest_show
-		 FROM miniseries
-		 INNER JOIN 
-			(SELECT series, 
-				COUNT(eps.id) AS number_of_episodes,
-				MAX(eps.date) AS latest_show,
-				MIN(eps.date) AS earliest_show
-			 FROM eps 
-			 WHERE eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-			 GROUP BY series) AS ep ON ep.series = miniseries.id
-		 WHERE miniseries.id = ?
-		 ORDER BY name'
-%-->
-<!--% query_shows_sql = 'SELECT
-	id, date, title,
-	duration, summary, notes,
-	explicit, eps.license, tags,
-	hosts.host, hosts.hostid
-	FROM eps
-	INNER JOIN hosts
-	ON eps.hostid = hosts.hostid
-	WHERE series = ? AND eps.date < DATE_ADD(NOW(), INTERVAL 1 DAY)
-	ORDER BY eps.id DESC
-	'
-%-->
-
diff --git a/templates/queries-series_episodes-sqlite.tpl.html b/templates/queries-series_episodes.tpl.html
similarity index 100%
rename from templates/queries-series_episodes-sqlite.tpl.html
rename to templates/queries-series_episodes.tpl.html
diff --git a/templates/queries-tags-sqlite.tpl.html b/templates/queries-tags-sqlite.tpl.html
deleted file mode 100644
index 9b5e0996..00000000
--- a/templates/queries-tags-sqlite.tpl.html
+++ /dev/null
@@ -1 +0,0 @@
-<!--% query_tags = 'SELECT id, tags FROM eps' %-->
diff --git a/templates/queries-tags-mysql.tpl.html b/templates/queries-tags.tpl.html
similarity index 100%
rename from templates/queries-tags-mysql.tpl.html
rename to templates/queries-tags.tpl.html
diff --git a/templates/rss-comments.tpl.xml b/templates/rss-comments.tpl.xml
index 8b9b42d1..6bbd0de0 100644
--- a/templates/rss-comments.tpl.xml
+++ b/templates/rss-comments.tpl.xml
@@ -24,7 +24,7 @@
     <width>144</width>
   </image>
   <atom:link href="<!--% absolute_url(http_baseurl) %-->comments.rss" rel="self" type="application/rss+xml" />  
-  <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+  <!--% USE DBI(constants.driver) %-->
   <!--% FOREACH response IN DBI.query('SELECT max( comment_timestamp) AS latest_update FROM comments') %-->
   
   <pubDate><!--% format_feed_date(response.latest_update) %--></pubDate>
diff --git a/templates/rss-hpr.tpl.xml b/templates/rss-hpr.tpl.xml
index e99aaadd..192461d9 100644
--- a/templates/rss-hpr.tpl.xml
+++ b/templates/rss-hpr.tpl.xml
@@ -1,5 +1,5 @@
 <!--% PROCESS 'shared-item.tpl.xml' %-->
-<!--% PROCESS "rss-query-hpr-${constants.database}.tpl.xml" %-->
+<!--% PROCESS "rss-query-hpr.tpl.xml" %-->
 <!--% FOREACH episode IN feed_result %-->
 <!--% display_item(episode, media_file_extension, audio_mime_type) %-->
 <!--% END %-->
diff --git a/templates/rss-hpr_total.tpl.xml b/templates/rss-hpr_total.tpl.xml
index 503a9439..5e3cfe67 100644
--- a/templates/rss-hpr_total.tpl.xml
+++ b/templates/rss-hpr_total.tpl.xml
@@ -1,5 +1,5 @@
 <!--% PROCESS 'shared-item.tpl.xml' %-->
-<!--% PROCESS "rss-query-hpr_total-${constants.database}.tpl.xml" %-->
+<!--% PROCESS "rss-query-hpr_total.tpl.xml" %-->
 <!--% FOREACH episode IN feed_result %-->
 <!--% display_item(episode, media_file_extension, audio_mime_type) %-->
 <!--% END %-->
diff --git a/templates/rss-query-hpr-mysql.tpl.xml b/templates/rss-query-hpr-mysql.tpl.xml
deleted file mode 100644
index 1b284a7f..00000000
--- a/templates/rss-query-hpr-mysql.tpl.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% query_hpr_feed = DBI.prepare('
-        SELECT
-            eps.id,
-            eps.explicit,
-            DATE_FORMAT(eps.date, \'%H:%i:%S %d:%m:%Y\') AS \'date\',
-            eps.license, eps.duration,
-            eps.title, eps.summary, eps.tags,
-            eps.notes,
-            hosts.local_image,
-            hosts.hostid,
-            hosts.host, hosts.email,
-            miniseries.name AS series, miniseries.id AS seriesid,
-            assets.size AS length
-        FROM eps
-        INNER JOIN hosts ON eps.hostid = hosts.hostid
-        INNER JOIN miniseries ON eps.series = miniseries.id
-        INNER JOIN assets ON eps.id = assets.episode_id
-        WHERE eps.date <= UTC_DATE()
-        AND assets.extension = ?
-        ORDER BY eps.date DESC
-        LIMIT 10
-')
-%-->
-<!--% feed_result = query_hpr_feed.execute(media_file_extension) %-->
-
diff --git a/templates/rss-query-hpr-sqlite.tpl.xml b/templates/rss-query-hpr.tpl.xml
similarity index 92%
rename from templates/rss-query-hpr-sqlite.tpl.xml
rename to templates/rss-query-hpr.tpl.xml
index 3466471a..20d4ac7b 100644
--- a/templates/rss-query-hpr-sqlite.tpl.xml
+++ b/templates/rss-query-hpr.tpl.xml
@@ -1,4 +1,4 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% query_hpr_feed = DBI.prepare('
         SELECT
             eps.id,
diff --git a/templates/rss-query-hpr_total-mysql.tpl.xml b/templates/rss-query-hpr_total-mysql.tpl.xml
deleted file mode 100644
index f8c775aa..00000000
--- a/templates/rss-query-hpr_total-mysql.tpl.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% query_hpr_feed = DBI.prepare('
-        SELECT
-            eps.id,
-            eps.explicit,
-            DATE_FORMAT(eps.date, \'%H:%i:%S %d:%m:%Y\') AS \'date\',
-            eps.license, eps.duration,
-            eps.title, eps.summary, eps.tags,
-            eps.notes,
-            hosts.local_image,
-            hosts.hostid,
-            hosts.host, hosts.email,
-            miniseries.name AS series, miniseries.id AS seriesid,
-            assets.size AS length
-        FROM eps
-        INNER JOIN hosts ON eps.hostid = hosts.hostid
-        INNER JOIN miniseries ON eps.series = miniseries.id
-        INNER JOIN assets ON eps.id = assets.episode_id
-        WHERE eps.date < UTC_DATE()
-        AND assets.extension = ?
-        ORDER BY eps.date DESC
-')
-%-->
-<!--% feed_result = query_hpr_feed.execute(media_file_extension) %-->
-
diff --git a/templates/rss-query-hpr_total-sqlite.tpl.xml b/templates/rss-query-hpr_total.tpl.xml
similarity index 91%
rename from templates/rss-query-hpr_total-sqlite.tpl.xml
rename to templates/rss-query-hpr_total.tpl.xml
index fd02ab64..a4397a71 100644
--- a/templates/rss-query-hpr_total-sqlite.tpl.xml
+++ b/templates/rss-query-hpr_total.tpl.xml
@@ -1,4 +1,4 @@
-<!--% USE DBI(constants.driver, constants.user, constants.password) %-->
+<!--% USE DBI(constants.driver) %-->
 <!--% query_hpr_feed = DBI.prepare('
         SELECT
             eps.id,
diff --git a/templates/shared-call_for_shows.tpl.html b/templates/shared-call_for_shows.tpl.html
index f0a25729..5fa960a8 100644
--- a/templates/shared-call_for_shows.tpl.html
+++ b/templates/shared-call_for_shows.tpl.html
@@ -1,5 +1,5 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
-<!--% PROCESS "queries-call_for_shows-${constants.database}.tpl.html" %-->
+<!--% PROCESS "queries-call_for_shows.tpl.html" %-->
 <!--% MACRO display_call_for_shows BLOCK %-->
 	<!--% result_call_for_shows = DBI.prepare(query_call_for_shows) %-->
 	<!--% results_call_for_shows = result_call_for_shows.execute().get_all() %-->