Remove some completed TODOs