small fixup of unused old vars