remove todo comment about refactoring