Comment sanitation and TODO removals