[Task] Remove old todos, fix intention
v0.6