Remove unneeded var
More var cleanup