Could ditch these TODOs.