Use DeleteCommand.delete where possible and fix some potential NPEs from its usage (dist)
DeleteCommand.delete