diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e7b15eb48..626fea31b 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -14,7 +14,6 @@ class CommentsController < ApplicationController
   end
   
   def search
-    # @search = Comment.search(params[:search])
   end
   
   def update
diff --git a/app/controllers/dmails_controller.rb b/app/controllers/dmails_controller.rb
index 971bcd1b7..c06f5b651 100644
--- a/app/controllers/dmails_controller.rb
+++ b/app/controllers/dmails_controller.rb
@@ -20,7 +20,6 @@ class DmailsController < ApplicationController
   end
   
   def search
-    # @search = Dmail.search(params[:search])
   end
   
   def show
diff --git a/app/controllers/forum_posts_controller.rb b/app/controllers/forum_posts_controller.rb
index eb20b3c80..62c03aec5 100644
--- a/app/controllers/forum_posts_controller.rb
+++ b/app/controllers/forum_posts_controller.rb
@@ -22,7 +22,6 @@ class ForumPostsController < ApplicationController
   end
   
   def search
-    # @search = ForumPost.search(params[:search])
   end
 
   def show
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 6e45b0a13..96b5abac3 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -4,7 +4,6 @@ class NotesController < ApplicationController
   before_filter :pass_html_id, :only => [:create]
   
   def search
-    # @search = Note.search(params[:search])
   end
   
   def index
diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb
index 7333ca6a6..f13245353 100644
--- a/app/controllers/pools_controller.rb
+++ b/app/controllers/pools_controller.rb
@@ -21,7 +21,6 @@ class PoolsController < ApplicationController
   end
   
   def search
-    # @search = Pool.search(params[:search])
   end
   
   def show
diff --git a/app/controllers/post_versions_controller.rb b/app/controllers/post_versions_controller.rb
index fc04fbeb4..8e1f215c6 100644
--- a/app/controllers/post_versions_controller.rb
+++ b/app/controllers/post_versions_controller.rb
@@ -8,6 +8,5 @@ class PostVersionsController < ApplicationController
   end
   
   def search
-    # @search = PostVersion.search(params[:search])
   end
 end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 6738e5e2e..c5a5c740a 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -14,7 +14,6 @@ class TagsController < ApplicationController
   end
   
   def search
-    # @search = Tag.search(params[:search])
   end
   
   def show
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 119165a86..d10d42f60 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -23,9 +23,6 @@ class UploadsController < ApplicationController
   end
 
   def create
-    render :nothing => true
-    return
-    
   	@upload = Upload.create(params[:upload].merge(:server => Socket.gethostname))
   	@upload.delay.process!
     respond_with(@upload)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b11f96c60..9ac40154a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -21,7 +21,6 @@ class UsersController < ApplicationController
   end
   
   def search
-    # @search = User.search(params[:search])
   end
   
   def show
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 329f61223..b8c4b5441 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -2,8 +2,6 @@
   <div id="a-new">
     <h1>Upload</h1>
     
-    <p>Uploads temporarily disabled</p>
-    
     <div id="upload-guide-notice">
       <p>Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.</p>
     </div>
@@ -11,7 +9,6 @@
     <%= render "image" %>
     <%= render "post", :post => @post %>
     <%= render "sources/info", :source => @source %>
-    <!--
     <%= form_for(@upload, :html => {:multipart => true, :class => "simple_form", :id => 'form'}) do |f| %>
       <div class="input">
         <%= f.label :file %>
@@ -62,7 +59,6 @@
         </div>
       </div>
     <% end %>
-    -->
   </div>
 </div>