diff --git a/Gemfile b/Gemfile
index 800b5dc6c..441eadebb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ group :test do
   gem "simplecov", :require => false
 end
 
-gem "rails", "3.1.0.rc1"
+gem "rails", "3.1.0.rc4"
 gem "pg"
 gem "memcache-client", :require => "memcache"
 gem "imagesize", :require => "image_size"
diff --git a/Gemfile.lock b/Gemfile.lock
index c7b2c5032..b094a0a82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,35 +17,35 @@ GEM
   remote: http://gemcutter.org/
   specs:
     aaronh-chronic (0.3.9)
-    actionmailer (3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
+    actionmailer (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    actionpack (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6.0beta1)
-      rack (~> 1.3.0.beta2)
+      i18n (~> 0.6)
+      rack (~> 1.3.0)
       rack-cache (~> 1.0.1)
       rack-mount (~> 0.8.1)
       rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.5)
+      sprockets (~> 2.0.0.beta.10)
       tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
-      i18n (~> 0.6.0beta1)
-    activerecord (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       arel (~> 2.1.1)
       tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
-    activesupport (3.1.0.rc1)
+    activeresource (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+    activesupport (3.1.0.rc4)
       multi_json (~> 1.0)
     arel (2.1.4)
     bcrypt-ruby (2.1.4)
@@ -55,7 +55,7 @@ GEM
       activesupport (~> 3.0)
       daemons
     erubis (2.7.0)
-    factory_girl (2.0.2)
+    factory_girl (2.0.3)
     haml (3.1.2)
     hike (1.2.0)
     i18n (0.6.0)
@@ -87,21 +87,23 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc1)
-      actionmailer (= 3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
-      activerecord (= 3.1.0.rc1)
-      activeresource (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    rails (3.1.0.rc4)
+      actionmailer (= 3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activerecord (= 3.1.0.rc4)
+      activeresource (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc1)
-    railties (3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+      railties (= 3.1.0.rc4)
+    railties (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
+    rdoc (3.9.1)
     shoulda (2.11.3)
     silent-postgres (0.0.8)
     simple_form (1.4.2)
@@ -110,7 +112,7 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
-    sprockets (2.0.0.beta.12)
+    sprockets (2.0.0.beta.13)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -144,7 +146,7 @@ DEPENDENCIES
   mocha
   nokogiri
   pg
-  rails (= 3.1.0.rc1)
+  rails (= 3.1.0.rc4)
   shoulda
   silent-postgres
   simple_form
diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb
deleted file mode 100644
index 70c6c2ff5..000000000
--- a/app/controllers/admin/posts_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Admin
-  class PostsController
-    def edit
-    end
-  end
-end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
deleted file mode 100644
index 58404a3e2..000000000
--- a/app/controllers/admin/users_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Admin::UsersController < ApplicationController
-  def edit
-  end
-  
-  def update
-  end
-end
diff --git a/app/views/admin/tags/edit.html.erb b/app/views/admin/tags/edit.html.erb
deleted file mode 100644
index 17f42b5b8..000000000
--- a/app/views/admin/tags/edit.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% form_tag({:action => "mass_edit"}, :onsubmit => "return confirm('Are you sure you wish to perform this tag edit?')") do %>
-  <%= text_field_tag "start", params[:source], :size => 60 %>
-  <%= text_field_tag "result", params[:name], :size => 60 %>
-  <%= button_to_function "Preview", "$('preview').innerHTML = 'Loading...'; new Ajax.Updater('preview', '#{url_for(:controller=>"tag",:action=>"edit_preview")}', {method: 'get', parameters: 'tags=' + $F('start')})" %><%= submit_tag "Save" %>
-<% end %>
-
-<%= render :partial => "footer" %>
-
-<div id="preview">
-</div>