Slightly edited remove behavior