Dutch commit 2

Prepared removing tasks from DB