upstream cleanup