remove dead code
Refactor