remove the upstream stuff