Remove unused code
remove dead code