Remove uses of toggle