Moving before_destroy callbacks because of rails/rails#3458

Moving before_destroy callbacks because of rails/rails#3458