NXP-9706: Handle most TODOs
Remove irrelevant TODO