Xiaojing: remove unused code
Xiaojing: remove unused code