Mostly a cleanup before tagging