Fix Delete and utilize it in update