diff --git a/config/initializers/scheduler.rb b/config/initializers/scheduler.rb
index bec2587..952ba10 100644
--- a/config/initializers/scheduler.rb
+++ b/config/initializers/scheduler.rb
@@ -1,9 +1,9 @@
-require 'rufus-scheduler'
-
-scheduler = Rufus::Scheduler.new
-
-#return if defined?(Rails::Console) || Rails.env.test? || File.split($0).last == 'rake'
-
-scheduler.cron '43 2 * * *' do
-  system('bundle exec rake recruitment:remove_preview_recruitment')
-end
+require 'rufus-scheduler'
+
+unless defined?(Rails::Console) || Rails.env.test? || File.split($0).last == 'rake'
+  scheduler = Rufus::Scheduler.new(lockfile: Rails.root.join('tmp', 'recruitment_scheduler.lock').to_s)
+
+  scheduler.cron '43 2 * * *' do
+    Recruitment.where(is_preview: true).destroy_all
+  end
+end
diff --git a/lib/tasks/event_news_tasks.rake b/lib/tasks/event_news_tasks.rake
deleted file mode 100644
index fbee4c0..0000000
--- a/lib/tasks/event_news_tasks.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-desc 'Remove duplicated EventNews created by preview'
-
-namespace :recruitment do
-  task :remove_preview_recruitment => [:environment] do
-    recruitment = EventNews.where(is_preview: true)
-    recruitment.destroy_all
-  end
-end
diff --git a/lib/tasks/recruitment_tasks.rake b/lib/tasks/recruitment_tasks.rake
index fbee4c0..234786a 100644
--- a/lib/tasks/recruitment_tasks.rake
+++ b/lib/tasks/recruitment_tasks.rake
@@ -1,8 +1,8 @@
-desc 'Remove duplicated EventNews created by preview'
+desc 'Remove duplicated Recruitment created by preview'
 
 namespace :recruitment do
   task :remove_preview_recruitment => [:environment] do
-    recruitment = EventNews.where(is_preview: true)
+    recruitment = Recruitment.where(is_preview: true)
     recruitment.destroy_all
   end
 end