remove todo since it is already an issue in jira