[refactor] Put find_and_delete back in; needs improvement
[refactor] Added resque