Delete command improvements