Remove TODO items that we clarified with Amir