remove useless code
change index