Why not move this into `removeAndFlush()` to reduce some code duplication?