Update feature tasks and cleanup