Remove narrative TODOs to improve readability