[Refactoring] Remove the toggle