diff --git a/src/core/comm/DatabaseCampaignMessage.proto.in b/src/core/comm/DatabaseCampaignMessage.proto.in
index 2044ea1c..9e4c4dbc 100644
--- a/src/core/comm/DatabaseCampaignMessage.proto.in
+++ b/src/core/comm/DatabaseCampaignMessage.proto.in
@@ -8,8 +8,6 @@ import "@CONCRETE_INJECTION_POINT@";
 
 message DatabaseCampaignMessage {
     required uint32 pilot_id                 = 1 [(sql_primary_key) = true];
-    required uint32 variant_id               = 2 [(sql_ignore) = true];
-    required uint32 fspmethod_id             = 3 [(sql_ignore) = true];
 
     // ToDo: injection_instr can be deleted if all experiments switched to
     // using generic InjectionPointMessage
@@ -27,4 +25,3 @@ message DatabaseExperimentMessage {
     required uint32 bitoffset      = 1 [(sql_primary_key) = true];
     required uint32 original_value = 2;
 }
-
diff --git a/src/core/cpn/DatabaseCampaign.cc b/src/core/cpn/DatabaseCampaign.cc
index de13a2df..b808e824 100644
--- a/src/core/cpn/DatabaseCampaign.cc
+++ b/src/core/cpn/DatabaseCampaign.cc
@@ -167,7 +167,7 @@ bool DatabaseCampaign::run_variant(Database::Variant variant) {
 	/* Gather jobs */
 	unsigned long experiment_count;
 	std::stringstream ss;
-	std::string sql_select = "SELECT p.id, p.injection_instr, p.injection_instr_absolute, p.data_address, p.data_width, p.fspmethod_id, t.instr1, t.instr2 ";
+	std::string sql_select = "SELECT p.id, p.injection_instr, p.injection_instr_absolute, p.data_address, p.data_width, t.instr1, t.instr2 ";
 	ss << " FROM fsppilot p "
 	   << " JOIN trace t"
 	   << " ON t.variant_id = p.variant_id AND t.data_address = p.data_address AND t.instr2 = p.instr2"
@@ -206,15 +206,11 @@ bool DatabaseCampaign::run_variant(Database::Variant variant) {
 		unsigned injection_instr = strtoul(row[1], NULL, 10);
 		unsigned data_address    = strtoul(row[3], NULL, 10);
 		unsigned data_width      = strtoul(row[4], NULL, 10);
-		unsigned fspmethod_id    = strtoul(row[5], NULL, 10);
-		unsigned instr1          = strtoul(row[6], NULL, 10);
-		unsigned instr2          = strtoul(row[7], NULL, 10);
+		unsigned instr1          = strtoul(row[5], NULL, 10);
+		unsigned instr2          = strtoul(row[6], NULL, 10);
 
 		DatabaseCampaignMessage pilot;
 		pilot.set_pilot_id(pilot_id);
-		// FIXME the fspmethod_id is auto-generated, send fspmethod.method instead (is this necessary at all?)
-		pilot.set_fspmethod_id(fspmethod_id);
-		pilot.set_variant_id(variant.id);
 		// ToDo: Remove this, if all experiments work with abstract API (InjectionPoint)
 		pilot.set_injection_instr(injection_instr);
 		pilot.set_variant(variant.variant);