remove redundent var
remove another redundent var
more cleanup