Pushing cleanup of validated TODOs