diff --git a/templates/authentic2/base.html b/templates/authentic2/base.html
index 46362a1..666fbae 100644
--- a/templates/authentic2/base.html
+++ b/templates/authentic2/base.html
@@ -1,5 +1,5 @@
 {% extends "../../authentic2/base.html" %}
-{% load staticfiles authentic2 %}
+{% load staticfiles %}
 
 {% block nav %}
 <div id="nav"></div>
@@ -10,12 +10,9 @@
   {% endblock %}
   {% block extra_scripts %}
   {% endblock %}
-  {% renderblock "css" %}
-  {% renderblock "js" %}
   {{ form.media }}
 {% endblock %}
 
 {% block footer-bottom %}
 {{ block.super }}
-{% renderblock "js-endpage" %}
 {% endblock %}
diff --git a/templates/authentic2/login_password_form.html b/templates/authentic2/login_password_form.html
index 264a6f1..d673bb5 100644
--- a/templates/authentic2/login_password_form.html
+++ b/templates/authentic2/login_password_form.html
@@ -1,4 +1,4 @@
-{% load i18n authentic2 staticfiles %}
+{% load i18n staticfiles %}
 {% block content %}
 <div>
 <form method="post" action="">
@@ -21,4 +21,4 @@
 </div>
 {% endblock %}
 
-{% addtoblock "js-endpage" %}<script type="text/javascript" src="{% static "authentic2/js/js_seconds_until.js" %}"></script>{% endaddtoblock %}
+{{ form.media }}
diff --git a/templates/authentic2_auth_fc/connecting.html b/templates/authentic2_auth_fc/connecting.html
index fc4201d..4e94b66 100644
--- a/templates/authentic2_auth_fc/connecting.html
+++ b/templates/authentic2_auth_fc/connecting.html
@@ -1,5 +1,4 @@
 {% load staticfiles %}
-{% load authentic2 %}
 {% load i18n %}
 
 {% if 'nofc' not in request.GET %}
diff --git a/templates/authentic2_auth_fc/unlink.html b/templates/authentic2_auth_fc/unlink.html
index 2abc3c0..fb68013 100644
--- a/templates/authentic2_auth_fc/unlink.html
+++ b/templates/authentic2_auth_fc/unlink.html
@@ -1,5 +1,5 @@
 {% extends "authentic2_auth_fc/base.html"%}
-{% load staticfiles authentic2 %}
+{% load staticfiles %}
 {% load i18n %}
 
 {% block content %}