inflate-upstream: clean up