Remove TODO, we will keep the questions elsewhere