cleanup before pulling upstream