Cleanup with upstream