diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index deaa38deb..5d2eeb868 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -2,12 +2,10 @@ class PhotosController < ApplicationController
   before_filter :authenticate_user!
   
   def create
-    @photo = Photo.new(params[:photo])
+    @photo = Photo.instantiate(params[:photo])
     @photo.person = current_user
-    #@photo.album = Album.first(:id => params[:photo][:album_id])
 
     if @photo.save
-      #@photo.album.save
       flash[:notice] = "Successfully uploaded photo."
       redirect_to @photo.album
     else