Merge pull request #1879 from pbeesley-arm/pb/todo-removal

Pb/todo removal