OPENDNSSEC-554: Clean up logic and cater for the case where zone delete is used with the --all option