diff --git a/templates/accounts/badges.html b/templates/accounts/badges.html
index 27cf6fc2..2caa2c6a 100644
--- a/templates/accounts/badges.html
+++ b/templates/accounts/badges.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
{% block title %}Account Settings - {% site_name %}{% endblock %}
diff --git a/templates/accounts/billing.html b/templates/accounts/billing.html
index 44cd2ab9..279cb528 100644
--- a/templates/accounts/billing.html
+++ b/templates/accounts/billing.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
{% block title %}Account Settings - {% site_name %}{% endblock %}
diff --git a/templates/accounts/login.html b/templates/accounts/login.html
index 2578dfa9..6f1e75a8 100644
--- a/templates/accounts/login.html
+++ b/templates/accounts/login.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load compress hc_extras staticfiles %}
+{% load compress hc_extras static %}
{% block content %}
diff --git a/templates/accounts/notifications.html b/templates/accounts/notifications.html
index b1c3979c..b4b07c07 100644
--- a/templates/accounts/notifications.html
+++ b/templates/accounts/notifications.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load hc_extras %}
{% block title %}Account Settings - {% site_name %}{% endblock %}
@@ -96,10 +96,3 @@
{% endblock %}
-
-{% block scripts %}
-{% compress js %}
-
-
-{% endcompress %}
-{% endblock %}
diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html
index 77c0fcbe..a59d5f9d 100644
--- a/templates/accounts/profile.html
+++ b/templates/accounts/profile.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load compress staticfiles hc_extras %}
+{% load compress static hc_extras %}
{% block title %}Account Settings - {% site_name %}{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 2841eed4..23d26005 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,5 +1,4 @@
-{% load hc_extras %}
-
+{% load compress staticfiles hc_extras %}
@@ -13,8 +12,6 @@
-
- {% load compress staticfiles %}
diff --git a/templates/base_bare.html b/templates/base_bare.html
index 98172e51..35bf23f2 100644
--- a/templates/base_bare.html
+++ b/templates/base_bare.html
@@ -1,5 +1,4 @@
-{% load hc_extras %}
-
+{% load compress static hc_extras %}
@@ -7,7 +6,6 @@
- {% load compress staticfiles %}
{% compress css %}
diff --git a/templates/front/base_docs.html b/templates/front/base_docs.html
index 978a731e..a38f1a18 100644
--- a/templates/front/base_docs.html
+++ b/templates/front/base_docs.html
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load staticfiles %}
{% block content %}
diff --git a/templates/front/channel_checks.html b/templates/front/channel_checks.html
index dae40013..10c6bcd7 100644
--- a/templates/front/channel_checks.html
+++ b/templates/front/channel_checks.html
@@ -1,4 +1,4 @@
-{% load compress humanize staticfiles hc_extras %}
+{% load humanize hc_extras %}