refact, remove useless codes