remove unuse var
change to original version