clean up upstream leftovers