Fix tasks and initial migration
Remove unused imports