upstream pull cleanup