Fix removal function