diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2fbfdef5..c78017d2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+02.04.2015
+
+* Depricated DelayedJob, kill all running delayed jobs if needed
+
 27.03.2015
  
 * Integrated DEPP engine to Registrar. Please note new DEPP configuration in application-example.yml
diff --git a/Gemfile b/Gemfile
index dcdae4548..c62df99f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,6 @@ gem 'paper_trail',
   github: 'airblade/paper_trail',
   ref: 'a453811226ec4ea59753ba6b827e390ced2fc140' # '~> 4.0.0.beta2' # archiving
 gem 'rails-settings-cached',     '~> 0.4.1' # for settings
-gem 'delayed_job_active_record', '~> 4.0.3' # delayed job
 
 # html-xml
 gem 'haml-rails', '~> 0.9.0' # haml for views
@@ -52,7 +51,6 @@ gem 'isikukood' # for EE-id validation
 
 # deploy
 gem 'whenever', '~> 0.9.4', require: false
-gem 'daemons',  '~> 1.1.9' # process delayed jobs
 
 # monitors
 gem 'newrelic_rpm', '~> 3.9.9.275'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a237dad4..985b84444 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,16 +156,10 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     currencies (0.4.2)
-    daemons (1.1.9)
     database_cleaner (1.3.0)
     debug_inspector (0.0.2)
     deep_cloneable (2.1.1)
       activerecord (>= 3.1.0, < 5.0.0)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (3.4.1)
@@ -519,10 +513,8 @@ DEPENDENCIES
   capybara (~> 2.4.1)
   coffee-rails (~> 4.1.0)
   countries (~> 0.10.0)
-  daemons (~> 1.1.9)
   database_cleaner (~> 1.3.0)
   deep_cloneable (~> 2.1.1)
-  delayed_job_active_record (~> 4.0.3)
   depp!
   devise (~> 3.4.1)
   digidoc_client (~> 0.2.1)
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 9098cb4e2..f351b52c4 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -71,7 +71,7 @@ class Ability
     can :manage, LegalDocument
     can :read, ApiLog::EppLog
     can :read, ApiLog::ReppLog
-    can :index, :delayed_job
+    # can :index, :delayed_job
     can :create, :zonefile
     can :access, :settings_menu
   end
diff --git a/app/models/concerns/domain_version_observer.rb b/app/models/concerns/domain_version_observer.rb
index 2846b48ce..f1e732f21 100644
--- a/app/models/concerns/domain_version_observer.rb
+++ b/app/models/concerns/domain_version_observer.rb
@@ -1,36 +1,3 @@
 module DomainVersionObserver
   extend ActiveSupport::Concern
-
-  # TODO: remove old
-  # included do
-    # after_save :delayed_whois_update
-  # end
-
-  # private
-
-  # def delayed_whois_update
-    # name = domain_name
-    # return unless name
-    # body = snapshot
-    # delay.update_private_whois(name, body)
-    # delay.update_public_whois(name, body)
-  # end
-
-  # def update_private_whois(domain_name, body)
-    # wd = Whois::PublicDomain.find_or_initialize_by(name: domain_name)
-    # wd.body = body
-    # wd.save!
-  # end
-
-  # def update_public_whois(domain_name, body)
-    # wd = Whois::PrivateDomain.find_or_initialize_by(name: domain_name)
-    # wd.body = body
-    # wd.save!
-  # end
-
-  # def domain_name
-    # name = reify.try(:name)
-    # name = load_snapshot[:domain][:name] if event == 'create'
-    # return name if name
-  # end
 end
diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index 48eed2494..68629ec2c 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -48,7 +48,7 @@
                   -# %li= link_to t(:domains_history), admin_domain_versions_path
                   %li= link_to t(:epp_logs), admin_epp_logs_path
                   %li= link_to t(:repp_logs), admin_repp_logs_path
-                  %li= link_to t(:background_jobs), admin_delayed_jobs_path
+                  -# %li= link_to t(:background_jobs), admin_delayed_jobs_path
 
                   %li.divider
                   %li.dropdown-header= t('users')
diff --git a/config/application.rb b/config/application.rb
index 87fdf723d..f44bb80f0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -45,8 +45,6 @@ module Registry
     # Instead, the errors will propagate normally just like in other Active Record callbacks.
     config.active_record.raise_in_transactional_callbacks = true
 
-    config.active_job.queue_adapter = :delayed_job
-
     config.generators do |g|
       g.stylesheets false
       g.javascripts false
diff --git a/config/deploy.rb b/config/deploy.rb
index 275f1c099..5bce5727e 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -17,7 +17,6 @@ set :deploy_to, '$HOME/registry'
 set :repository, 'https://github.com/domify/registry' # dev repo
 set :branch, 'master'
 set :rails_env, 'alpha'
-set :delayed_job, true
 
 # alpha branch
 task :epp do
@@ -26,7 +25,6 @@ task :epp do
   set :repository, 'https://github.com/domify/registry' # dev repo
   set :branch, 'master'
   set :rails_env, 'alpha'
-  set :delayed_job, false
 end
 
 task :registrar do
@@ -35,7 +33,6 @@ task :registrar do
   set :repository, 'https://github.com/domify/registry' # dev repo
   set :branch, 'master'
   set :rails_env, 'alpha'
-  set :delayed_job, false
 end
 
 # staging
@@ -45,7 +42,6 @@ task :st do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master' # same as production
   set :rails_env, 'staging'
-  set :delayed_job, true
 end
 
 # staging
@@ -55,7 +51,6 @@ task :eppst do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master' # same as production
   set :rails_env, 'staging'
-  set :delayed_job, false
 end
 
 # staging
@@ -65,7 +60,6 @@ task :registrarst do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master'
   set :rails_env, 'staging'
-  set :delayed_job, false
 end
 
 # production
@@ -75,7 +69,6 @@ task :pr do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master' # same as staging
   set :rails_env, 'production'
-  set :delayed_job, true
 end
 
 # production
@@ -85,7 +78,6 @@ task :epppr do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master' # same as staging
   set :rails_env, 'production'
-  set :delayed_job, false
 end
 
 # production
@@ -95,7 +87,6 @@ task :registrarst do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master'
   set :rails_env, 'production'
-  set :delayed_job, false
 end
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
@@ -159,10 +150,6 @@ task deploy: :environment do
   deploy do
     # Put things that will set up an empty directory into a fully set-up
     # instance of your project.
-    to :prepare do
-      invoke :'delayed_job:stop' if delayed_job
-    end
-
     invoke :'git:clone'
     invoke :load_commit_hash
     invoke :'deploy:link_shared_paths'
@@ -171,7 +158,6 @@ task deploy: :environment do
     invoke :'rails:assets_precompile'
     to :launch do
       invoke :restart
-      invoke :'delayed_job:start' if delayed_job
     end
   end
 end
@@ -197,16 +183,6 @@ task load_commit_hash: :environment do
   )
 end
 
-namespace :delayed_job do
-  task stop: :environment do
-    queue %(echo "-----> Stopping delayed job"; cd #{deploy_to}/current; RAILS_ENV=#{rails_env} bin/delayed_job stop)
-  end
-
-  task start: :environment do
-    queue %(echo "-----> Starting delayed job"; cd #{deploy_to}/current; RAILS_ENV=#{rails_env} bin/delayed_job start)
-  end
-end
-
 desc 'Restart Passenger application'
 task restart: :environment do
   queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt"
diff --git a/db/migrate/20150402114712_drop_delayed_job.rb b/db/migrate/20150402114712_drop_delayed_job.rb
new file mode 100644
index 000000000..b5844b76f
--- /dev/null
+++ b/db/migrate/20150402114712_drop_delayed_job.rb
@@ -0,0 +1,5 @@
+class DropDelayedJob < ActiveRecord::Migration
+  def change
+    drop_table :delayed_jobs
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 464f2dd8c..4f718e907 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150330083700) do
+ActiveRecord::Schema.define(version: 20150402114712) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -108,22 +108,6 @@ ActiveRecord::Schema.define(version: 20150330083700) do
     t.string   "updator_str"
   end
 
-  create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",   default: 0, null: false
-    t.integer  "attempts",   default: 0, null: false
-    t.text     "handler",                null: false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
-
   create_table "delegation_signers", force: :cascade do |t|
     t.integer "domain_id"
     t.string  "key_tag"