fix bug & remove useless.