update again
remove useless code