[TRIVIAL] Cleaning up some TODOs [ci skip]