remove todo from code, replace with issue in GH