Some minor clean up

Remove redudant var