Updated task list and removed unused module