missed a few obsolete vars
pull in cleanup obsolete vars