Remove old TODOs, update CAD phase info