diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index b357803998fd6b62227aa313ee95c5432ed551cd..7c9cd2898fdd9076727cf27d57745596967bcc42 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -4,14 +4,10 @@ module SocketsHelper
  def obj_id(object)
     (object.is_a? Post) ? object.id : object.post_id
   end
-  
-  #def url_options
-  #  {:host => ""}
-  #end
 
   def action_hash(uid, object)
     begin
-      user = User.first(:id => uid)
+      user = User.find_by_id(uid)
       v = render_to_string(:partial => type_partial(object), :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction
     rescue Exception => e
       Rails.logger.error("web socket view rendering failed for object #{object.inspect}.")
diff --git a/app/models/person.rb b/app/models/person.rb
index afd48bea51cc311d77ac053f1f0d5fca0e2fe0f5..cf22b00fb6bc87b9462e24454608141f40913ead 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -57,16 +57,7 @@ class Person
   end
 
 
-  ######## Posting ########
-  def post(class_name, options = {})
-    options[:person] = self
-    model_class = class_name.to_s.camelize.constantize
-    post = model_class.instantiate(options)
-    post.creator_signature = post.sign_with_key(encryption_key)
-    post.notify_people
-    post.socket_to_uid owner.id if (owner_id && post.respond_to?( :socket_to_uid))
-    post
-  end
+
 
   ######## Commenting  ########
   def comment(text, options = {})
diff --git a/app/models/user.rb b/app/models/user.rb
index a9b4a0b304bdabb2a3569cff220dff1ba7a5ae2e..7ab2987d9f9773f35989bace58e6276a98e2a5d5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -37,7 +37,17 @@ class User
     Group.create(opts)
   end
 
-  ######### Posts and Such ###############
+   ######## Posting ########
+  def post(class_name, options = {})
+    options[:person] = self.person
+    model_class = class_name.to_s.camelize.constantize
+    post = model_class.instantiate(options)
+    post.creator_signature = post.sign_with_key(encryption_key)
+    post.notify_people
+    post.socket_to_uid owner.id if (owner_id && post.respond_to?( :socket_to_uid))
+    post
+  end ######### Posts and Such ###############
+
   def retract( post )
     retraction = Retraction.for(post)
     retraction.creator_signature = retraction.sign_with_key( encryption_key ) 
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 19673cb243b96784afafb31a74701eaf25c18f47..33624cb61ce5197272fced842d1c3c80a798aa4e 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -5,7 +5,6 @@ describe 'SocketsController' do
   before do
     @user = Factory.create(:user)
     SocketsController.unstub!(:new)
-    #EventMachine::WebSocket.stub!(:start)
     @controller = SocketsController.new
     @controller.request = mock_model(Request, :env =>
       {'warden' => mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)})