remove TODO from public consumption