master b829419 cleanup cov emeritus endorse py3 statements