Refactor batch deletion
Unit tests and refactoring
100% unit tests and command refactoring