remove some useless code, add some comment