diff --git a/include/villas/sample.h b/include/villas/sample.h
index 89f0181ad..c9bf1c94a 100644
--- a/include/villas/sample.h
+++ b/include/villas/sample.h
@@ -72,8 +72,6 @@ struct sample {
 	int capacity;		/**< The number of values in sample::values for which memory is reserved. */
 	int flags;		/**< Flags are used to store binary properties of a sample. */
 
-	struct node *source;	/**< The node from which this sample originates. */
-	struct node *destination; /**< The node to which this sample will be sent. */
 
 	atomic_int refcnt;	/**< Reference counter. */
 	ptrdiff_t pool_off;	/**< This sample belongs to this memory pool (relative pointer). See sample_pool(). */
diff --git a/lib/formats/json_reserve.c b/lib/formats/json_reserve.c
index bab00bd14..b484e9dd5 100644
--- a/lib/formats/json_reserve.c
+++ b/lib/formats/json_reserve.c
@@ -113,9 +113,6 @@ static int json_reserve_pack_sample(struct io *io, json_t **j, struct sample *sm
 #else
 	if (io->output.node)
 		json_object_set_new(*j, "target", json_string(io->output.node->name));
-
-	if (smp->source)
-		json_object_set_new(*j, "origin", json_string(smp->source->name));
 #endif
 
 	return 0;
diff --git a/lib/mapping.c b/lib/mapping.c
index 0b368e872..1af2c7f41 100644
--- a/lib/mapping.c
+++ b/lib/mapping.c
@@ -355,7 +355,6 @@ int mapping_remap(struct list *m, struct sample *remapped, struct sample *origin
 
 	/* We copy all the header fields */
 	remapped->sequence = original->sequence;
-	remapped->source   = original->source;
 	remapped->ts       = original->ts;
 
 	for (size_t i = 0; i < list_length(m); i++) {
diff --git a/lib/node.c b/lib/node.c
index 2cc65e642..fbf9903c0 100644
--- a/lib/node.c
+++ b/lib/node.c
@@ -437,8 +437,6 @@ int node_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
 
 	/* Add missing fields */
 	for (int i = 0; i < nread; i++) {
-		smps[i]->source = n;
-
 		if (!(smps[i]->flags & SAMPLE_HAS_SEQUENCE))
 			smps[i]->sequence = n->sequence++;
 
diff --git a/lib/sample.c b/lib/sample.c
index 9b3cd77f5..bff357496 100644
--- a/lib/sample.c
+++ b/lib/sample.c
@@ -148,7 +148,6 @@ int sample_copy(struct sample *dst, struct sample *src)
 	dst->length = MIN(src->length, dst->capacity);
 
 	dst->sequence = src->sequence;
-	dst->source = src->source;
 	dst->flags = src->flags;
 	dst->ts = src->ts;