Remove dependency on delayed_job