diff --git a/lib/Lacuna/DB/Result/Ships.pm b/lib/Lacuna/DB/Result/Ships.pm
index b231e8a2..ba61fbaf 100644
--- a/lib/Lacuna/DB/Result/Ships.pm
+++ b/lib/Lacuna/DB/Result/Ships.pm
@@ -268,8 +268,9 @@ sub pick_up_spies {
         $spy->update;
     }
     my $payload = $self->payload;
+    delete $payload->{fetch_spies};
     $payload->{spies} = \@riding;
-    $self->payload($payload);
+    #$self->payload($payload);
     $cargo_log->new({
         message     => 'after pick up spies',
         body_id     => $self->foreign_body_id,
@@ -284,13 +285,13 @@ sub handle_cargo_exchange {
     my $self = shift;
     if ($self->direction eq 'out') {
         $self->unload($self->payload, $self->foreign_body);
-        $self->payload({});
+        #$self->payload({});
         $self->turn_around;
         $self->pick_up_spies; # goes after turn around so we have the new date available
     }
     else {
         $self->unload($self->payload, $self->body);
-        $self->payload({});
+        #$self->payload({});
         $self->land;
     }
 }
diff --git a/lib/Lacuna/Role/Container.pm b/lib/Lacuna/Role/Container.pm
index 1cadccb3..e9743750 100644
--- a/lib/Lacuna/Role/Container.pm
+++ b/lib/Lacuna/Role/Container.pm
@@ -41,6 +41,7 @@ sub unload {
             $prisoner->on_body_id($body->id);
             $prisoner->update;
         }
+        delete $payload->{prisoners};
     }
     if (exists $payload->{ships}) {
         foreach my $id (@{$payload->{ships}}) {
@@ -49,10 +50,12 @@ sub unload {
             $ship->body_id($body->id);
             $ship->update;
         }
+        delete $payload->{ships};
     }
     if (exists $payload->{essentia}) {
         $body->empire->add_essentia($payload->{essentia}, 'Trade Unloaded');
         $body->empire->update;
+        delete $payload->{essentia};
     }
     if (exists $payload->{resources}) {
         my %resources = %{$payload->{resources}};
@@ -60,16 +63,19 @@ sub unload {
             $body->add_type($type, $resources{$type});
         }
         $body->update;
+        delete $payload->{resources};
     }
     if (exists $payload->{plans}) {
         foreach my $plan (@{$payload->{plans}}) {
             $body->add_plan($plan->{class}, $plan->{level}, $plan->{extra_build_level});
         }
+        delete $payload->{plans};
     }
     if (exists $payload->{glyphs}) {
         foreach my $glyph (@{$payload->{glyphs}}) {
             $body->add_glyph($glyph);
         }
+        delete $payload->{glyphs};
     }
     $cargo_log->new({
         message     => 'after unload',