Refactor to use AppDispatcher solely
Fix task deletion