Remove TODO in favor of issues