diff --git a/pkg/upstreamApi/cif.go b/pkg/upstreamApi/cif.go
index bc3c723..00518aa 100644
--- a/pkg/upstreamApi/cif.go
+++ b/pkg/upstreamApi/cif.go
@@ -61,25 +61,25 @@ type ScheduleNewScheduleSegment struct {
 	UidCode       string `json:"uid_code"`
 }
 
-// Part of the JsonScheduleV1 type
+// Part of the JsonScheduleV1 type - Not used keys commented out
 type CifScheduleSegment struct {
-	SignallingId                string                `json:"signalling_id"`
-	CifTrainCategory            string                `json:"CIF_train_category"`
-	CifHeadcode                 string                `json:"CIF_headcode"`
-	CifCourseIndicator          int64                 `json:"CIF_course_indicator"`
-	CifTrainServiceCode         string                `json:"CIF_train_service_code"`
-	CifBusinessSector           string                `json:"CIF_business_sector"`
-	CifPowerType                string                `json:"CIF_power_type"`
-	CifTimingLoad               string                `json:"CIF_timing_load"`
-	CifSpeed                    string                `json:"CIF_speed"`
-	CifOperatingCharacteristics string                `json:"CIF_operating_characteristics"`
-	CifTrainClass               string                `json:"CIF_train_class"`
-	CifSleepers                 string                `json:"CIF_sleepers"`
-	CifReservations             string                `json:"CIF_reservations"`
-	CifConnectionIndicator      string                `json:"CIF_connection_indicator"`
-	CifCateringCode             string                `json:"CIF_catering_code"`
-	CifServiceBranding          string                `json:"CIF_service_branding"`
-	ScheduleLocation            []CifScheduleLocation `json:"schedule_location"`
+	SignallingId     string `json:"signalling_id"`
+	CifTrainCategory string `json:"CIF_train_category"`
+	CifHeadcode      string `json:"CIF_headcode"`
+	//	CifCourseIndicator          int64                 `json:"CIF_course_indicator"`
+	CifTrainServiceCode         string `json:"CIF_train_service_code"`
+	CifBusinessSector           string `json:"CIF_business_sector"`
+	CifPowerType                string `json:"CIF_power_type"`
+	CifTimingLoad               string `json:"CIF_timing_load"`
+	CifSpeed                    string `json:"CIF_speed"`
+	CifOperatingCharacteristics string `json:"CIF_operating_characteristics"`
+	CifTrainClass               string `json:"CIF_train_class"`
+	CifSleepers                 string `json:"CIF_sleepers"`
+	CifReservations             string `json:"CIF_reservations"`
+	//	CifConnectionIndicator      string                `json:"CIF_connection_indicator"`
+	CifCateringCode string `json:"CIF_catering_code"`
+	//	CifServiceBranding string                `json:"CIF_service_branding"`
+	ScheduleLocation []CifScheduleLocation `json:"schedule_location"`
 }
 
 // Part of the CifScheduleSegment type
diff --git a/pkg/upstreamApi/vstp.go b/pkg/upstreamApi/vstp.go
index 12d6c25..81c2a34 100644
--- a/pkg/upstreamApi/vstp.go
+++ b/pkg/upstreamApi/vstp.go
@@ -22,25 +22,25 @@ type VSTPSchedule struct {
 	ScheduleSegment       []VSTPScheduleSegment `json:"schedule_segment"`
 }
 
-// Part of the VSTPSchedule type
+// Part of the VSTPSchedule type - Not used keys commented out
 type VSTPScheduleSegment struct {
-	SignallingId                string                 `json:"signalling_id"`
-	CifTrainCategory            string                 `json:"CIF_train_category"`
-	CifHeadcode                 string                 `json:"CIF_headcode"`
-	CifCourseIndicator          int64                  `json:"CIF_course_indicator"`
-	CifTrainServiceCode         string                 `json:"CIF_train_service_code"`
-	CifBusinessSector           string                 `json:"CIF_business_sector"`
-	CifPowerType                string                 `json:"CIF_power_type"`
-	CifTimingLoad               string                 `json:"CIF_timing_load"`
-	CifSpeed                    string                 `json:"CIF_speed"`
-	CifOperatingCharacteristics string                 `json:"CIF_operating_characteristics"`
-	CifTrainClass               string                 `json:"CIF_train_class"`
-	CifSleepers                 string                 `json:"CIF_sleepers"`
-	CifReservations             string                 `json:"CIF_reservations"`
-	CifConnectionIndicator      string                 `json:"CIF_connection_indicator"`
-	CifCateringCode             string                 `json:"CIF_catering_code"`
-	CifServiceBranding          string                 `json:"CIF_service_branding"`
-	ScheduleLocation            []VSTPScheduleLocation `json:"schedule_location"`
+	SignallingId     string `json:"signalling_id"`
+	CifTrainCategory string `json:"CIF_train_category"`
+	CifHeadcode      string `json:"CIF_headcode"`
+	//	CifCourseIndicator          int64                  `json:"CIF_course_indicator"`
+	CifTrainServiceCode         string `json:"CIF_train_service_code"`
+	CifBusinessSector           string `json:"CIF_business_sector"`
+	CifPowerType                string `json:"CIF_power_type"`
+	CifTimingLoad               string `json:"CIF_timing_load"`
+	CifSpeed                    string `json:"CIF_speed"`
+	CifOperatingCharacteristics string `json:"CIF_operating_characteristics"`
+	CifTrainClass               string `json:"CIF_train_class"`
+	CifSleepers                 string `json:"CIF_sleepers"`
+	CifReservations             string `json:"CIF_reservations"`
+	//	CifConnectionIndicator      string                 `json:"CIF_connection_indicator"`
+	CifCateringCode    string                 `json:"CIF_catering_code"`
+	CifServiceBranding string                 `json:"CIF_service_branding"`
+	ScheduleLocation   []VSTPScheduleLocation `json:"schedule_location"`
 }
 
 // Part of the VSTPScheduleSegment type