Fix entity#remove()