diff --git a/website/agenda/templates/calendar_js.html b/website/agenda/templates/calendar_js.html
deleted file mode 100644
index 0377d25..0000000
--- a/website/agenda/templates/calendar_js.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<TMPL_IF use_client_cache>Cache-Control: max-age=3600, must-revalidate
-</TMPL_IF>Content-type:text/html; charset=UTF-8;
-
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="expires" content="36000">
-	<meta http-equiv="Content-Script-Type" content="javascript" />
-	<meta http-equiv="Content-Style-Type" content="text/css" />
-
-	<title>Calendar <TMPL_VAR project_title></title>
-</head>
-<body>
-
-<div >
-<TMPL_IF debug>
-	<div id="calendar_debug"></div>
-</TMPL_IF>
-
-<table cellpadding="0" cellspacing="0" border="0" width="190">
-<tr>
-	<th class="first">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
-		>&lt;</a>
-		<!--onclick="calcms.selectMonthEventListener('<TMPL_VAR previous_month>');return false;"-->
-	</th>
-	<th colspan="6" width="180" align="center">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
-		>		
-			<TMPL_VAR start_month_name> <TMPL_VAR start_year>
-		</a>
-		<!--onclick="calcms.selectMonthEventListener('<TMPL_VAR start_date>');return false;"-->
-	</th>
-	<th class="last">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
-		>&gt;</a>
-	</th>
-	<!--onclick="calcms.selectMonthEventListener('<TMPL_VAR next_month>');return false;"-->
-</tr>
-<tr>
-<th>Wo</th>
-<TMPL_LOOP NAME=weekdays>
-	<th>
-		<a 	href="<TMPL_VAR base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR start_date>/<TMPL_VAR end_date>/<TMPL_VAR weekday>/" 
-			onclick="calcms.selectWeekdayEventListener('<TMPL_VAR start_date>','<TMPL_VAR end_date>','<TMPL_VAR weekday>');return false;"
-		>
-			<TMPL_VAR "weekday_short_name">
-		</a>
-	</th>
-</TMPL_LOOP>
-</tr>
-
-<TMPL_LOOP NAME=week_and_days>
-<tr>
-	<TMPL_LOOP NAME=week>
-	<th class="<TMPL_VAR class>">
-		<a 	href="<TMPL_VAR base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR from_date>/<TMPL_VAR till_date>/"
-			title="<TMPL_VAR description>"
-			onclick="calcms.selectDateRangeEventListener('<TMPL_VAR from_date>','<TMPL_VAR till_date>');return false;"
-		>
-			<TMPL_VAR week_of_year>
-		</a>
-	</th>
-	</TMPL_LOOP>
-
-	<TMPL_LOOP NAME=days>
-	<td class="<TMPL_VAR class>">
-		<TMPL_IF is_day>
-			<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html"
-				title="<TMPL_VAR description>"
-			>
-				<TMPL_VAR day>
-			</a>
-		</TMPL_IF>
-	</td>
-	</TMPL_LOOP>
-</tr>
-</TMPL_LOOP>
-</table>
-
-
-</div>
-</body>
-</html>
diff --git a/website/agenda/templates/calendar_mobile.html b/website/agenda/templates/calendar_mobile.html
deleted file mode 100644
index 99db1a0..0000000
--- a/website/agenda/templates/calendar_mobile.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<TMPL_IF use_client_cache>Cache-Control: max-age=3600, must-revalidate
-</TMPL_IF>Content-type:text/html; charset=UTF-8;
-
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="expires" content="36000">
-	<meta http-equiv="Content-Script-Type" content="javascript" />
-	<meta http-equiv="Content-Style-Type" content="text/css" />
-
-	<title>Calendar <TMPL_VAR project_title></title>
-</head>
-<body>
-
-<div >
-<TMPL_IF debug>
-	<div id="calendar_debug"></div>
-</TMPL_IF>
-
-<table cellpadding="0" cellspacing="0" border="0">
-<tr>
-	<th class="first">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
-		>&laquo;</a>
-	</th>
-	<th colspan="6" align="center">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
-		><TMPL_VAR start_month_name> <TMPL_VAR start_year></a>
-	</th>
-	<th class="last">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
-		>&raquo;</a>
-	</th>
-</tr>
-<tr>
-<th>Wo</th>
-<TMPL_LOOP NAME=weekdays>
-	<th>
-		<a 	href="<TMPL_VAR base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR start_date>/<TMPL_VAR end_date>/<TMPL_VAR weekday>/" 
-			onclick="calcms.selectWeekdayEventListener('<TMPL_VAR start_date>','<TMPL_VAR end_date>','<TMPL_VAR weekday>');return false;"
-		><TMPL_VAR "weekday_short_name"></a>
-	</th>
-</TMPL_LOOP>
-</tr>
-
-<TMPL_LOOP NAME=week_and_days>
-<tr>
-	<TMPL_LOOP NAME=week>
-	<th class="<TMPL_VAR class>">
-		<a 	href="<TMPL_VAR base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR from_date>/<TMPL_VAR till_date>/"
-			title="<TMPL_VAR description>"
-			onclick="calcms.selectDateRangeEventListener('<TMPL_VAR from_date>','<TMPL_VAR till_date>');return false;"
-		><TMPL_VAR week_of_year></a>
-	</th>
-	</TMPL_LOOP>
-
-	<TMPL_LOOP NAME=days>
-	<td class="<TMPL_VAR class>">
-		<TMPL_IF is_day>
-			<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html"
-				title="<TMPL_VAR description>"
-			><TMPL_VAR day></a>
-		</TMPL_IF>
-	</td>
-	</TMPL_LOOP>
-</tr>
-</TMPL_LOOP>
-</table>
-
-
-</div>
-</body>
-</html>
diff --git a/website/agenda/templates/event_list_image.html b/website/agenda/templates/event_list_image.html
deleted file mode 100644
index b7100d2..0000000
--- a/website/agenda/templates/event_list_image.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<TMPL_IF use_client_cache>Cache-Control: max-age=600, must-revalidate
-</TMPL_IF>Content-type:text/html; charset=utf-8;
-
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="expires" content="3600">
-	<meta http-equiv="Content-Script-Type" content="javascript" />
-	<meta http-equiv="Content-Style-Type" content="text/css" />
-	<title>Agenda <TMPL_VAR project_title></title>
-	<link type="text/css" rel="stylesheet" media="all" href="/agenda/css/future.css" />
-
-</head>
-
-<body>
-<TMPL_LOOP NAME=events>
-<TMPL_IF name="is_first_of_day">
-	<div class="date">
-		<TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name><TMPL_IF project_title> - <TMPL_VAR project_title></TMPL_IF>
-	</div>
-</TMPL_IF>
-
-<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >
-<div  class="event">
-	<TMPL_IF event_id>
-		<div class="header"><TMPL_VAR series_name><br><TMPL_VAR full_title_no_series></div>
-		<div class="content" style="background-image: url(<TMPL_VAR image>)"></div>
-
-		<div class="label">
-			<TMPL_VAR start_time><br/>
-			<a class="comment" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments"
-				<span class="submitted"><TMPL_VAR comment_count> Kommentar<TMPL_UNLESS one_comment>e</TMPL_UNLESS></span>
-			</a>
-		</div>
-	</TMPL_IF>
-</div>
-</a>
-</TMPL_LOOP>
-
-</body>
-</html>
-
diff --git a/website/agenda/templates/event_utc_time.txt b/website/agenda/templates/event_utc_time.txt
deleted file mode 100644
index d663da3..0000000
--- a/website/agenda/templates/event_utc_time.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<TMPL_IF use_client_cache>Cache-Control: max-age=600, must-revalidate
-</TMPL_IF>Content-type:text/plain; charset=utf-8;
-
-<TMPL_LOOP NAME=events><TMPL_VAR start_utc_epoch> <TMPL_VAR end_utc_epoch> <TMPL_VAR full_title>
-</TMPL_LOOP>
