Remove the TODO from the comments as we now have an ssue to cover this
Remove the TODO from the comments as we now have an ssue to cover this

scholzj/barnabas,ppatierno/kaas,scholzj/barnabas,ppatierno/kaas