TODO list cleared up