_remove changed to _reset