Remove to TODO's

EBD-10266