diff --git a/app/controllers/faq_controller.rb b/app/controllers/faq_controller.rb
deleted file mode 100644
index c3d25213f..000000000
--- a/app/controllers/faq_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class FaqController < ApplicationController
-
-  skip_before_filter :check_xhr
-
-  def index
-    render layout: false
-  end
-
-end
diff --git a/app/controllers/privacy_controller.rb b/app/controllers/privacy_controller.rb
deleted file mode 100644
index 1d403862c..000000000
--- a/app/controllers/privacy_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class PrivacyController < ApplicationController
-
-  skip_before_filter :check_xhr
-
-  def index
-    render layout: false
-  end
-
-end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 9038082de..e9dcba739 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -9,6 +9,11 @@ class StaticController < ApplicationController
     # Don't allow paths like ".." or "/" or anything hacky like that
     page.gsub!(/[^a-z0-9\_\-]/, '')
 
+    # Some variables to substitute
+    @company_shortname = 'CDCK'
+    @company_fullname = 'Civilized Discourse Construction Kit, Inc.'
+    @company_domain = 'discourse.org'
+
     file = "static/#{page}.html"
     templates = lookup_context.find_all(file)
     if templates.any?
diff --git a/app/controllers/tos_controller.rb b/app/controllers/tos_controller.rb
deleted file mode 100644
index 91a477192..000000000
--- a/app/controllers/tos_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class TosController < ApplicationController
-
-  skip_before_filter :check_xhr
-
-  def index
-    @company_shortname = 'CDCK'
-    @company_fullname = 'Civilized Discourse Construction Kit, Inc.'
-    @company_domain = 'discourse.org'
-    render
-  end
-
-end
\ No newline at end of file