Remove TODOs on lines I just fixed.