Added dated TODO for removing old variable.