Remove completed tasks
Reorganize TODO