Implement proper per script and per PR cleanup too.