we should remove the `remove` case from the switch since we're now doing an early return in the remove case.