Delete command improvments