Revert "Pull in deletion queue tests into master"

Those tests don't work for some reason, but the tasks run fine if CELERY_ALWAYS_EAGER=False

This reverts commit 01b4dfead902ed2c70ff9b173ca1168012aa512d.
Be less agressive with optimisation - a lot of it was breaking under certain conditions