Fix warning
remove dead code