Remove tasks remnants
Merge pull request #39 from hyperoslo/fix/tasks-remnants

Remove tasks remnants