clean up unneeded vars.