diff --git a/app/models/photo.rb b/app/models/photo.rb
index 91a4421fff18ee1f12273f38bd9580a367945a5a..7176ecbd686057527d5c2a58563af1b7851c86ee 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -34,7 +34,7 @@ class Photo < Post
   end
 
   def remote_photo
-    @remote_photo ||= User.owner.url.chop + image.url(:scaled_full)
+    @remote_photo ||= User.owner.url.chop + image.url
   end
 
   def remote_photo= remote_path
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 112e9d9881cf76e5131a3acc274715dffe4948ac..bb5176eacf6c660410358a14c1431a6b6e4efefc 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -16,14 +16,6 @@ class Profile
 
   validates_presence_of :first_name, :last_name
 
-  # before_save :expand_profile_photo_path
-  # 
-  # 
-  # def expand_profile_photo_path
-  #   unless image_url.nil? || self.image_url.include?(parent_document.url)
-  #     self.image_url = self._parent_document.url + self.image_url
-  #   end
-  # end
   def person_id
     self._parent_document.id
   end
diff --git a/lib/diaspora/diaspora_parser.rb b/lib/diaspora/diaspora_parser.rb
index 4b6623dc9bf65b3390ee5a7bbbb28162774a49c1..f40dc6cc5e6e9a4ddf6aa84ddc4df1d86bbd3ec4 100644
--- a/lib/diaspora/diaspora_parser.rb
+++ b/lib/diaspora/diaspora_parser.rb
@@ -30,14 +30,7 @@ module Diaspora
             person.profile = object
             person.save  
           end
-            objects << object
-          #elsif object.is_a? Profile
-          #  person = parse_owner_id_from_xml post
-          #  profile_hash = Hash.from_xml(post.to_s)
-          #  person.profile.update_attributes!(profile_hash)
-          #else
-          #  object << object
-          #end 
+          objects << object
         rescue
           Rails.logger.info "Not a real type: #{object.to_s}"
         end
@@ -53,16 +46,11 @@ module Diaspora
           p.perform
         elsif p.is_a? Request
           User.owner.receive_friend_request(p)
-        #This line checks if the sender was in the database, among other things?
         elsif p.is_a? Profile
-
-          puts p.person_id
-
           p.save
-        elsif p.respond_to?(:person) && !(p.person.nil?) && !(p.person.is_a? User) #WTF
+        elsif p.respond_to?(:person) && !(p.person.nil?) && !(p.person.is_a? User) 
           Rails.logger.info("Saving object with success: #{p.save}")
         end
-        #p.save if p.respond_to?(:person) && !(p.person == nil) #WTF
       end
     end
   end