[DISCUSS]remove unused code

[king hao]

Hi,all
Remove unused code and optimize code to avoid possible risk.

Best Regards, kinghao