Fix unneeded local vars