Add clean channel shutdown code to RunListener reverter