Use makeDestroy instead of destroy

**This PR is against the `feature/delete-task-queue branch.`**

I've opened up this PR so that we can discuss which solution is better.