remove TODO from codebase