- [X] Refactor - Remove some dead code