diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index eed7f29..3f06dbb 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -199,15 +199,6 @@ class ConferencesController < ApplicationController
 								@registration.steps_completed << form_step
 								@registration.steps_completed.uniq!
 							end
-
-							# workshops is the last step
-							# if @register_template == :workshops
-							# 	UserMailer.send_mail :registration_confirmation do
-							# 		{
-							# 			:args => @registration
-							# 		}
-							# 	end
-							# end
 						end
 
 						@registration.save!
diff --git a/app/models/conference_registration.rb b/app/models/conference_registration.rb
index 31ea194..4a0c1d3 100644
--- a/app/models/conference_registration.rb
+++ b/app/models/conference_registration.rb
@@ -55,21 +55,4 @@ class ConferenceRegistration < ActiveRecord::Base
 			end
 		end
 	end
-
-	# before_update do | registration |
-	# 	old_status = status
-	# 	new_status = registration.status
-	# 	puts " ===== #{old_status.to_s} : #{new_status.to_s} ===== "
-	# 	if old_status.present? && old_status != new_status
-	# 		if (conference.registration_status == :pre && new_status == :preregistered) ||
-	# 			(conference.registration_status == :open && new_status == :registered)
-	# 		end
-
-	# 		UserMailer.send_mail :registration_confirmation do
-	# 			{
-	# 				:args => registration
-	# 			}
-	# 		end
-	# 	end
-	# end
 end