Additional cleanup from upgrade