Modify the remove functionality