missed a few obsolete vars