get rid of upstream stuff