fix bug, remove useless lines