ENG-6375 Separate drop batch from creates