Clear obsolete TODOs
Uses proper exception