Refactor - Remove dead code