remove unnecessary local var
remove another unneeded local var