upstream_cleanup
