Refactor: Removed dead code