remove useless codes again