Ghost User
--- a/src/libknot/zone/zone-contents.c
+++ b/src/libknot/zone/zone-contents.c
+	knot_node_t *parent = knot_zone_contents_get_node(contents, cutted);
+	assert(parent || node == contents->apex);
+	bool parent_empty = parent && parent->rrset_count == 0;
+	while (parent_empty) {
+		knot_node_t *empty_node = NULL;
+		int ret = knot_zone_tree_remove(contents->nodes, parent->owner,
+		                                &empty_node);
+		if (ret != KNOT_EOK) {
+			return ret;
+		}
+		assert(empty_node && empty_node->rrset_count == 0);
+		cutted = knot_wire_next_label(cutted, NULL);
+		parent = knot_zone_contents_get_node(contents, cutted);
+		knot_node_free(&empty_node);
+		parent_empty = parent && parent->rrset_count == 0;
+	}
--- a/src/libknot/dnssec/zone-events.c
+++ b/src/libknot/dnssec/zone-events.c
                              knot_update_serial_t soa_up,
                              uint32_t *used_lifetime,
                              uint32_t *used_refresh,
-                              uint32_t new_serial)
+                              uint32_t new_serial,
+                              hattrie_t **sorted_changes)
--- a/src/libknot/dnssec/zone-sign.c
+++ b/src/libknot/dnssec/zone-sign.c
 /*!
 * \brief Sign changeset created by DDNS or zone-diff.
 */
-int knot_zone_sign_changeset(const knot_zone_contents_t *zone,
+int knot_zone_sign_changeset(const knot_zone_t *zone,
                            const knot_changeset_t *in_ch,
                            knot_changeset_t *out_ch,
+                            hattrie_t **sorted_changes,
--- a/src/libknot/dnssec/zone-sign.c
+++ b/src/libknot/dnssec/zone-sign.c
 	}

 	// Create args for wrapper function - hattrie for duplicate sigs
-	changeset_signing_data_t args = { .zone = zone, .zone_keys = zone_keys,
+	changeset_signing_data_t args = { .zone = zone->contents,
+	                                  .zone_keys = zone_keys,
 	                                  .policy = policy,
 	                                  .changeset = out_ch,
-	                                  .signed_table = hattrie_create()};
+	                                  .signed_tree = hattrie_create()};