diff --git a/broker/JFJochBroker.cpp b/broker/JFJochBroker.cpp
index e04c8bf5..e90481c2 100644
--- a/broker/JFJochBroker.cpp
+++ b/broker/JFJochBroker.cpp
@@ -152,26 +152,6 @@ grpc::Status JFJochBroker::GetRadialIntegrationProfiles(grpc::ServerContext *con
     GRPC_RUN( *response = Convert(state_machine.GetRadialIntegrationProfiles()) );
 }
 
-grpc::Status JFJochBroker::GetPedestalG0(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                                         JFJochProtoBuf::Image *response) {
-    GRPC_RUN( *response = state_machine.GetPedestalG0() );
-}
-
-grpc::Status JFJochBroker::GetPedestalG1(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                                         JFJochProtoBuf::Image *response) {
-    GRPC_RUN( *response = state_machine.GetPedestalG1() );
-}
-
-grpc::Status JFJochBroker::GetPedestalG2(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                                         JFJochProtoBuf::Image *response) {
-    GRPC_RUN( *response = state_machine.GetPedestalG2() );
-}
-
-grpc::Status JFJochBroker::GetMask(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                                   JFJochProtoBuf::Image *response) {
-    GRPC_RUN( *response = state_machine.GetNeXusMask() );
-}
-
 grpc::Status JFJochBroker::GetDetectorSettings(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
                                                JFJochProtoBuf::DetectorSettings *response) {
     GRPC_RUN( *response = state_machine.GetDetectorSettings() );
diff --git a/broker/JFJochBroker.h b/broker/JFJochBroker.h
index 6e7c6733..37615af0 100644
--- a/broker/JFJochBroker.h
+++ b/broker/JFJochBroker.h
@@ -46,9 +46,6 @@ public:
     grpc::Status GetRadialIntegrationProfiles(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
                                               JFJochProtoBuf::RadialIntegrationProfiles *response) override;
 
-    grpc::Status GetPedestalG0(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                               JFJochProtoBuf::Image *response) override;
-
     grpc::Status GetCalibrationStatistics(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
                                             JFJochProtoBuf::JFCalibrationStatistics *response) override;
 
@@ -64,15 +61,6 @@ public:
     grpc::Status PutDataProcessingSettings(grpc::ServerContext *context, const JFJochProtoBuf::DataProcessingSettings *request,
                                            JFJochProtoBuf::Empty *response) override;
 
-    grpc::Status GetPedestalG1(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                               JFJochProtoBuf::Image *response) override;
-
-    grpc::Status GetPedestalG2(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                               JFJochProtoBuf::Image *response) override;
-
-    grpc::Status GetMask(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
-                         JFJochProtoBuf::Image *response) override;
-
     grpc::Status GetMeasurementStatistics(grpc::ServerContext *context, const JFJochProtoBuf::Empty *request,
                                             JFJochProtoBuf::MeasurementStatistics *response) override;
 
diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index 80b892de..be881da4 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -499,67 +499,6 @@ DiffractionExperiment &JFJochStateMachine::NotThreadSafe_Experiment() {
     return experiment;
 }
 
-
-JFJochProtoBuf::Image JFJochStateMachine::GetNeXusMask() const {
-    std::unique_lock<std::mutex> ul(m);
-    if (state == JFJochState::Inactive)
-        throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Detector not calibrated");
-
-    JFJochProtoBuf::Image ret;
-    auto mask = calibration->CalculateNexusMask(experiment);
-
-    ret.set_width(experiment.GetXPixelsNum());
-    ret.set_height(experiment.GetYPixelsNum());
-    ret.set_pixel_depth(4);
-    *ret.mutable_data() = {mask.begin(), mask.end()};
-    return ret;
-}
-
-JFJochProtoBuf::Image JFJochStateMachine::GetPedestalG0() const {
-    std::unique_lock<std::mutex> ul(m);
-    if (state == JFJochState::Inactive)
-        throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Detector not calibrated");
-
-    JFJochProtoBuf::Image ret;
-    auto pedestal = calibration->GetPedestal(0);
-
-    ret.set_width(experiment.GetXPixelsNum());
-    ret.set_height(experiment.GetYPixelsNum());
-    ret.set_pixel_depth(2);
-    *ret.mutable_data() = {pedestal.begin(), pedestal.end()};
-    return ret;
-}
-
-JFJochProtoBuf::Image JFJochStateMachine::GetPedestalG1() const {
-    std::unique_lock<std::mutex> ul(m);
-    if (state == JFJochState::Inactive)
-        throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Detector not calibrated");
-
-    JFJochProtoBuf::Image ret;
-    auto pedestal = calibration->GetPedestal(1);
-
-    ret.set_width(experiment.GetXPixelsNum());
-    ret.set_height(experiment.GetYPixelsNum());
-    ret.set_pixel_depth(2);
-    *ret.mutable_data() = {pedestal.begin(), pedestal.end()};
-    return ret;
-}
-
-JFJochProtoBuf::Image JFJochStateMachine::GetPedestalG2() const {
-    std::unique_lock<std::mutex> ul(m);
-    if (state == JFJochState::Inactive)
-        throw JFJochException(JFJochExceptionCategory::WrongDAQState, "Detector not calibrated");
-
-    JFJochProtoBuf::Image ret;
-    auto pedestal = calibration->GetPedestal(2);
-
-    ret.set_width(experiment.GetXPixelsNum());
-    ret.set_height(experiment.GetYPixelsNum());
-    ret.set_pixel_depth(2);
-    *ret.mutable_data() = {pedestal.begin(), pedestal.end()};
-    return ret;
-}
-
 JFJochProtoBuf::BrokerStatus JFJochStateMachine::GetStatus() const {
     JFJochProtoBuf::BrokerStatus ret;
 
diff --git a/broker/JFJochStateMachine.h b/broker/JFJochStateMachine.h
index cc4d1582..3e480d9d 100644
--- a/broker/JFJochStateMachine.h
+++ b/broker/JFJochStateMachine.h
@@ -88,11 +88,6 @@ public:
     Plot GetPlots(const PlotRequest &request) const;
     RadialIntegrationProfiles GetRadialIntegrationProfiles() const;
 
-    JFJochProtoBuf::Image GetNeXusMask() const;
-    JFJochProtoBuf::Image GetPedestalG0() const;
-    JFJochProtoBuf::Image GetPedestalG1() const;
-    JFJochProtoBuf::Image GetPedestalG2() const;
-
     void SetDataProcessingSettings(const DataProcessingSettings& settings);
     DataProcessingSettings GetDataProcessingSettings() const;
     DataProcessingSettings GetDataAnalysisSettings() const;
diff --git a/grpc/jfjoch.proto b/grpc/jfjoch.proto
index d8e93754..5bda2c10 100644
--- a/grpc/jfjoch.proto
+++ b/grpc/jfjoch.proto
@@ -164,18 +164,6 @@ message DataProcessingSettings {
   bool preview_indexed_only = 10;
 }
 
-message Image {
-  bytes data = 1;
-  int64 width = 2;
-  int64 height = 3;
-  int64 pixel_depth = 4;
-}
-
-message MaskToLoad {
-  repeated uint32 mask = 1;
-  int32 bit_to_set = 2;
-}
-
 message MeasurementStatistics {
   string file_prefix = 1;
   int64 images_collected = 2;
@@ -237,11 +225,6 @@ service gRPC_JFJochBroker {
   rpc GetPlots (PlotRequest) returns (Plot) {}
   rpc GetRadialIntegrationProfiles(Empty) returns (RadialIntegrationProfiles) {}
 
-  rpc GetPedestalG0 (Empty) returns (Image) {}
-  rpc GetPedestalG1 (Empty) returns (Image) {}
-  rpc GetPedestalG2 (Empty) returns (Image) {}
-  rpc GetMask (Empty) returns (Image) {}
-
   rpc GetDetectorList (Empty) returns (DetectorList) {}
   rpc SelectDetector (DetectorSelection) returns (Empty) {}
 }
\ No newline at end of file
diff --git a/python/jfjoch_pb2.py b/python/jfjoch_pb2.py
index 5df676f9..c89fccc3 100644
--- a/python/jfjoch_pb2.py
+++ b/python/jfjoch_pb2.py
@@ -13,23 +13,23 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xb1\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12:\n\x11\x66pga_pixel_output\x18\x03 \x01(\x0e\x32\x1f.JFJochProtoBuf.FPGAPixelOutput\x12\x11\n\tsummation\x18\x04 \x01(\x03\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12+\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCell\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12 \n\x18rad_int_solid_angle_corr\x18\x12 \x01(\x08\x12!\n\x19rad_int_polarization_corr\x18\x13 \x01(\x08\x12#\n\x1brad_int_polarization_factor\x18\x14 \x01(\x02\x12\x18\n\x10save_calibration\x18\x15 \x01(\x08\"\x90\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x15\n\rcount_time_us\x18\x02 \x01(\x03\x12\x1a\n\x12storage_cell_count\x18\x03 \x01(\x03\x12%\n\x1duse_internal_packet_generator\x18\x04 \x01(\x08\x12\x18\n\x10\x63ollect_raw_data\x18\x05 \x01(\x08\x12\x1a\n\x12pedestal_g0_frames\x18\x06 \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\x07 \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x08 \x01(\x03\x12\x1d\n\x15storage_cell_delay_ns\x18\n \x01(\x03\"\xed\x01\n\x10ModuleStatistics\x12\x15\n\rmodule_number\x18\x01 \x01(\x03\x12\x1b\n\x13storage_cell_number\x18\x02 \x01(\x03\x12\x18\n\x10pedestal_g0_mean\x18\x03 \x01(\x02\x12\x18\n\x10pedestal_g1_mean\x18\x04 \x01(\x02\x12\x18\n\x10pedestal_g2_mean\x18\x05 \x01(\x02\x12\x14\n\x0cgain_g0_mean\x18\x06 \x01(\x02\x12\x14\n\x0cgain_g1_mean\x18\x07 \x01(\x02\x12\x14\n\x0cgain_g2_mean\x18\x08 \x01(\x02\x12\x15\n\rmasked_pixels\x18\t \x01(\x04\"V\n\x17JFCalibrationStatistics\x12;\n\x11module_statistics\x18\x01 \x03(\x0b\x32 .JFJochProtoBuf.ModuleStatistics\"F\n\x0bPlotRequest\x12&\n\x04type\x18\x01 \x01(\x0e\x32\x18.JFJochProtoBuf.PlotType\x12\x0f\n\x07\x62inning\x18\x02 \x01(\x04\"M\n\x18RadialIntegrationProfile\x12\r\n\x05title\x18\x01 \x01(\t\x12\"\n\x04plot\x18\x02 \x01(\x0b\x32\x14.JFJochProtoBuf.Plot\"W\n\x19RadialIntegrationProfiles\x12:\n\x08profiles\x18\x01 \x03(\x0b\x32(.JFJochProtoBuf.RadialIntegrationProfile\"\xbb\x02\n\x16\x44\x61taProcessingSettings\x12!\n\x19signal_to_noise_threshold\x18\x01 \x01(\x02\x12\x1e\n\x16photon_count_threshold\x18\x02 \x01(\x03\x12\x18\n\x10min_pix_per_spot\x18\x03 \x01(\x03\x12\x18\n\x10max_pix_per_spot\x18\x04 \x01(\x03\x12\x16\n\x0elocal_bkg_size\x18\x05 \x01(\x03\x12\x1d\n\x15high_resolution_limit\x18\x06 \x01(\x02\x12\x1c\n\x14low_resolution_limit\x18\x07 \x01(\x02\x12\x1a\n\x12\x62kg_estimate_low_q\x18\x08 \x01(\x02\x12\x1b\n\x13\x62kg_estimate_high_q\x18\t \x01(\x02\x12\x1c\n\x14preview_indexed_only\x18\n \x01(\x08\"I\n\x05Image\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x12\r\n\x05width\x18\x02 \x01(\x03\x12\x0e\n\x06height\x18\x03 \x01(\x03\x12\x13\n\x0bpixel_depth\x18\x04 \x01(\x03\".\n\nMaskToLoad\x12\x0c\n\x04mask\x18\x01 \x03(\r\x12\x12\n\nbit_to_set\x18\x02 \x01(\x05\"\xc9\x02\n\x15MeasurementStatistics\x12\x13\n\x0b\x66ile_prefix\x18\x01 \x01(\t\x12\x18\n\x10images_collected\x18\x02 \x01(\x03\x12\x1d\n\x15max_image_number_sent\x18\x03 \x01(\x03\x12\x1d\n\x15\x63ollection_efficiency\x18\x04 \x01(\x02\x12\x19\n\x11\x63ompression_ratio\x18\x05 \x01(\x02\x12\x11\n\tcancelled\x18\x06 \x01(\x08\x12\x19\n\x11max_receive_delay\x18\x07 \x01(\x03\x12\x15\n\rindexing_rate\x18\n \x01(\x02\x12\x16\n\x0e\x64\x65tector_width\x18\x0c \x01(\x03\x12\x17\n\x0f\x64\x65tector_height\x18\r \x01(\x03\x12\x1c\n\x14\x64\x65tector_pixel_depth\x18\x0e \x01(\x03\x12\x14\n\x0c\x62kg_estimate\x18\x10 \x01(\x02\"\x89\x01\n\x0c\x42rokerStatus\x12+\n\x0c\x62roker_state\x18\x01 \x01(\x0e\x32\x15.JFJochProtoBuf.State\x12\x10\n\x08progress\x18\x02 \x01(\x02\x12\x15\n\rindexing_rate\x18\x03 \x01(\x02\x12#\n\x1breceiver_send_buffers_avail\x18\x04 \x01(\x02\"H\n\x13\x44\x65tectorListElement\x12\x13\n\x0b\x64\x65scription\x18\x01 \x01(\t\x12\x10\n\x08nmodules\x18\x02 \x01(\x03\x12\n\n\x02id\x18\x03 \x01(\x03\"v\n\x0c\x44\x65tectorList\x12\x35\n\x08\x64\x65tector\x18\x01 \x03(\x0b\x32#.JFJochProtoBuf.DetectorListElement\x12\x12\n\ncurrent_id\x18\x02 \x01(\x03\x12\x1b\n\x13\x63urrent_description\x18\x03 \x01(\t\"\x1f\n\x11\x44\x65tectorSelection\x12\n\n\x02id\x18\x01 \x01(\x03*T\n\x0b\x43ompression\x12\r\n\tBSHUF_LZ4\x10\x00\x12\x0e\n\nBSHUF_ZSTD\x10\x01\x12\x12\n\x0e\x42SHUF_ZSTD_RLE\x10\x02\x12\x12\n\x0eNO_COMPRESSION\x10\x03*Z\n\x0c\x44\x65tectorMode\x12\x0e\n\nCONVERSION\x10\x00\x12\x07\n\x03RAW\x10\x01\x12\x0f\n\x0bPEDESTAL_G0\x10\x02\x12\x0f\n\x0bPEDESTAL_G1\x10\x03\x12\x0f\n\x0bPEDESTAL_G2\x10\x04*^\n\x05State\x12\x13\n\x0fNOT_INITIALIZED\x10\x00\x12\x08\n\x04IDLE\x10\x01\x12\x08\n\x04\x42USY\x10\x02\x12\x0c\n\x08PEDESTAL\x10\x03\x12\x13\n\x0f\x44\x41TA_COLLECTION\x10\x04\x12\t\n\x05\x45RROR\x10\x05*I\n\x0f\x46PGAPixelOutput\x12\x08\n\x04\x41UTO\x10\x00\x12\t\n\x05INT16\x10\x01\x12\n\n\x06UINT16\x10\x02\x12\t\n\x05INT32\x10\x03\x12\n\n\x06UINT32\x10\x04*{\n\x08PlotType\x12\x10\n\x0c\x42KG_ESTIMATE\x10\x00\x12\x0b\n\x07RAD_INT\x10\x01\x12\x0e\n\nSPOT_COUNT\x10\x02\x12\x11\n\rINDEXING_RATE\x10\x03\x12\x1a\n\x16INDEXING_RATE_PER_FILE\x10\x04\x12\x11\n\rADU_HISTOGRAM\x10\x05\x32\xd4\x0c\n\x11gRPC_JFJochBroker\x12\x41\n\x05Start\x12\x1f.JFJochProtoBuf.DatasetSettings\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x36\n\x04Stop\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12:\n\x08Pedestal\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12<\n\nInitialize\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x38\n\x06\x43\x61ncel\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12<\n\nDeactivate\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x39\n\x07Trigger\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x42\n\tGetStatus\x12\x15.JFJochProtoBuf.Empty\x1a\x1c.JFJochProtoBuf.BrokerStatus\"\x00\x12\\\n\x18GetCalibrationStatistics\x12\x15.JFJochProtoBuf.Empty\x1a\'.JFJochProtoBuf.JFCalibrationStatistics\"\x00\x12P\n\x13GetDetectorSettings\x12\x15.JFJochProtoBuf.Empty\x1a .JFJochProtoBuf.DetectorSettings\"\x00\x12P\n\x13PutDetectorSettings\x12 .JFJochProtoBuf.DetectorSettings\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12Z\n\x18GetMeasurementStatistics\x12\x15.JFJochProtoBuf.Empty\x1a%.JFJochProtoBuf.MeasurementStatistics\"\x00\x12\\\n\x19GetDataProcessingSettings\x12\x15.JFJochProtoBuf.Empty\x1a&.JFJochProtoBuf.DataProcessingSettings\"\x00\x12\\\n\x19PutDataProcessingSettings\x12&.JFJochProtoBuf.DataProcessingSettings\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12?\n\x08GetPlots\x12\x1b.JFJochProtoBuf.PlotRequest\x1a\x14.JFJochProtoBuf.Plot\"\x00\x12\x62\n\x1cGetRadialIntegrationProfiles\x12\x15.JFJochProtoBuf.Empty\x1a).JFJochProtoBuf.RadialIntegrationProfiles\"\x00\x12?\n\rGetPedestalG0\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Image\"\x00\x12?\n\rGetPedestalG1\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Image\"\x00\x12?\n\rGetPedestalG2\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Image\"\x00\x12\x39\n\x07GetMask\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Image\"\x00\x12H\n\x0fGetDetectorList\x12\x15.JFJochProtoBuf.Empty\x1a\x1c.JFJochProtoBuf.DetectorList\"\x00\x12L\n\x0eSelectDetector\x12!.JFJochProtoBuf.DetectorSelection\x1a\x15.JFJochProtoBuf.Empty\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xb1\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12:\n\x11\x66pga_pixel_output\x18\x03 \x01(\x0e\x32\x1f.JFJochProtoBuf.FPGAPixelOutput\x12\x11\n\tsummation\x18\x04 \x01(\x03\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12+\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCell\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12 \n\x18rad_int_solid_angle_corr\x18\x12 \x01(\x08\x12!\n\x19rad_int_polarization_corr\x18\x13 \x01(\x08\x12#\n\x1brad_int_polarization_factor\x18\x14 \x01(\x02\x12\x18\n\x10save_calibration\x18\x15 \x01(\x08\"\x90\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x15\n\rcount_time_us\x18\x02 \x01(\x03\x12\x1a\n\x12storage_cell_count\x18\x03 \x01(\x03\x12%\n\x1duse_internal_packet_generator\x18\x04 \x01(\x08\x12\x18\n\x10\x63ollect_raw_data\x18\x05 \x01(\x08\x12\x1a\n\x12pedestal_g0_frames\x18\x06 \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\x07 \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x08 \x01(\x03\x12\x1d\n\x15storage_cell_delay_ns\x18\n \x01(\x03\"\xed\x01\n\x10ModuleStatistics\x12\x15\n\rmodule_number\x18\x01 \x01(\x03\x12\x1b\n\x13storage_cell_number\x18\x02 \x01(\x03\x12\x18\n\x10pedestal_g0_mean\x18\x03 \x01(\x02\x12\x18\n\x10pedestal_g1_mean\x18\x04 \x01(\x02\x12\x18\n\x10pedestal_g2_mean\x18\x05 \x01(\x02\x12\x14\n\x0cgain_g0_mean\x18\x06 \x01(\x02\x12\x14\n\x0cgain_g1_mean\x18\x07 \x01(\x02\x12\x14\n\x0cgain_g2_mean\x18\x08 \x01(\x02\x12\x15\n\rmasked_pixels\x18\t \x01(\x04\"V\n\x17JFCalibrationStatistics\x12;\n\x11module_statistics\x18\x01 \x03(\x0b\x32 .JFJochProtoBuf.ModuleStatistics\"F\n\x0bPlotRequest\x12&\n\x04type\x18\x01 \x01(\x0e\x32\x18.JFJochProtoBuf.PlotType\x12\x0f\n\x07\x62inning\x18\x02 \x01(\x04\"M\n\x18RadialIntegrationProfile\x12\r\n\x05title\x18\x01 \x01(\t\x12\"\n\x04plot\x18\x02 \x01(\x0b\x32\x14.JFJochProtoBuf.Plot\"W\n\x19RadialIntegrationProfiles\x12:\n\x08profiles\x18\x01 \x03(\x0b\x32(.JFJochProtoBuf.RadialIntegrationProfile\"\xbb\x02\n\x16\x44\x61taProcessingSettings\x12!\n\x19signal_to_noise_threshold\x18\x01 \x01(\x02\x12\x1e\n\x16photon_count_threshold\x18\x02 \x01(\x03\x12\x18\n\x10min_pix_per_spot\x18\x03 \x01(\x03\x12\x18\n\x10max_pix_per_spot\x18\x04 \x01(\x03\x12\x16\n\x0elocal_bkg_size\x18\x05 \x01(\x03\x12\x1d\n\x15high_resolution_limit\x18\x06 \x01(\x02\x12\x1c\n\x14low_resolution_limit\x18\x07 \x01(\x02\x12\x1a\n\x12\x62kg_estimate_low_q\x18\x08 \x01(\x02\x12\x1b\n\x13\x62kg_estimate_high_q\x18\t \x01(\x02\x12\x1c\n\x14preview_indexed_only\x18\n \x01(\x08\"\xc9\x02\n\x15MeasurementStatistics\x12\x13\n\x0b\x66ile_prefix\x18\x01 \x01(\t\x12\x18\n\x10images_collected\x18\x02 \x01(\x03\x12\x1d\n\x15max_image_number_sent\x18\x03 \x01(\x03\x12\x1d\n\x15\x63ollection_efficiency\x18\x04 \x01(\x02\x12\x19\n\x11\x63ompression_ratio\x18\x05 \x01(\x02\x12\x11\n\tcancelled\x18\x06 \x01(\x08\x12\x19\n\x11max_receive_delay\x18\x07 \x01(\x03\x12\x15\n\rindexing_rate\x18\n \x01(\x02\x12\x16\n\x0e\x64\x65tector_width\x18\x0c \x01(\x03\x12\x17\n\x0f\x64\x65tector_height\x18\r \x01(\x03\x12\x1c\n\x14\x64\x65tector_pixel_depth\x18\x0e \x01(\x03\x12\x14\n\x0c\x62kg_estimate\x18\x10 \x01(\x02\"\x89\x01\n\x0c\x42rokerStatus\x12+\n\x0c\x62roker_state\x18\x01 \x01(\x0e\x32\x15.JFJochProtoBuf.State\x12\x10\n\x08progress\x18\x02 \x01(\x02\x12\x15\n\rindexing_rate\x18\x03 \x01(\x02\x12#\n\x1breceiver_send_buffers_avail\x18\x04 \x01(\x02\"H\n\x13\x44\x65tectorListElement\x12\x13\n\x0b\x64\x65scription\x18\x01 \x01(\t\x12\x10\n\x08nmodules\x18\x02 \x01(\x03\x12\n\n\x02id\x18\x03 \x01(\x03\"v\n\x0c\x44\x65tectorList\x12\x35\n\x08\x64\x65tector\x18\x01 \x03(\x0b\x32#.JFJochProtoBuf.DetectorListElement\x12\x12\n\ncurrent_id\x18\x02 \x01(\x03\x12\x1b\n\x13\x63urrent_description\x18\x03 \x01(\t\"\x1f\n\x11\x44\x65tectorSelection\x12\n\n\x02id\x18\x01 \x01(\x03*T\n\x0b\x43ompression\x12\r\n\tBSHUF_LZ4\x10\x00\x12\x0e\n\nBSHUF_ZSTD\x10\x01\x12\x12\n\x0e\x42SHUF_ZSTD_RLE\x10\x02\x12\x12\n\x0eNO_COMPRESSION\x10\x03*Z\n\x0c\x44\x65tectorMode\x12\x0e\n\nCONVERSION\x10\x00\x12\x07\n\x03RAW\x10\x01\x12\x0f\n\x0bPEDESTAL_G0\x10\x02\x12\x0f\n\x0bPEDESTAL_G1\x10\x03\x12\x0f\n\x0bPEDESTAL_G2\x10\x04*^\n\x05State\x12\x13\n\x0fNOT_INITIALIZED\x10\x00\x12\x08\n\x04IDLE\x10\x01\x12\x08\n\x04\x42USY\x10\x02\x12\x0c\n\x08PEDESTAL\x10\x03\x12\x13\n\x0f\x44\x41TA_COLLECTION\x10\x04\x12\t\n\x05\x45RROR\x10\x05*I\n\x0f\x46PGAPixelOutput\x12\x08\n\x04\x41UTO\x10\x00\x12\t\n\x05INT16\x10\x01\x12\n\n\x06UINT16\x10\x02\x12\t\n\x05INT32\x10\x03\x12\n\n\x06UINT32\x10\x04*{\n\x08PlotType\x12\x10\n\x0c\x42KG_ESTIMATE\x10\x00\x12\x0b\n\x07RAD_INT\x10\x01\x12\x0e\n\nSPOT_COUNT\x10\x02\x12\x11\n\rINDEXING_RATE\x10\x03\x12\x1a\n\x16INDEXING_RATE_PER_FILE\x10\x04\x12\x11\n\rADU_HISTOGRAM\x10\x05\x32\xd6\n\n\x11gRPC_JFJochBroker\x12\x41\n\x05Start\x12\x1f.JFJochProtoBuf.DatasetSettings\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x36\n\x04Stop\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12:\n\x08Pedestal\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12<\n\nInitialize\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x38\n\x06\x43\x61ncel\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12<\n\nDeactivate\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x39\n\x07Trigger\x12\x15.JFJochProtoBuf.Empty\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12\x42\n\tGetStatus\x12\x15.JFJochProtoBuf.Empty\x1a\x1c.JFJochProtoBuf.BrokerStatus\"\x00\x12\\\n\x18GetCalibrationStatistics\x12\x15.JFJochProtoBuf.Empty\x1a\'.JFJochProtoBuf.JFCalibrationStatistics\"\x00\x12P\n\x13GetDetectorSettings\x12\x15.JFJochProtoBuf.Empty\x1a .JFJochProtoBuf.DetectorSettings\"\x00\x12P\n\x13PutDetectorSettings\x12 .JFJochProtoBuf.DetectorSettings\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12Z\n\x18GetMeasurementStatistics\x12\x15.JFJochProtoBuf.Empty\x1a%.JFJochProtoBuf.MeasurementStatistics\"\x00\x12\\\n\x19GetDataProcessingSettings\x12\x15.JFJochProtoBuf.Empty\x1a&.JFJochProtoBuf.DataProcessingSettings\"\x00\x12\\\n\x19PutDataProcessingSettings\x12&.JFJochProtoBuf.DataProcessingSettings\x1a\x15.JFJochProtoBuf.Empty\"\x00\x12?\n\x08GetPlots\x12\x1b.JFJochProtoBuf.PlotRequest\x1a\x14.JFJochProtoBuf.Plot\"\x00\x12\x62\n\x1cGetRadialIntegrationProfiles\x12\x15.JFJochProtoBuf.Empty\x1a).JFJochProtoBuf.RadialIntegrationProfiles\"\x00\x12H\n\x0fGetDetectorList\x12\x15.JFJochProtoBuf.Empty\x1a\x1c.JFJochProtoBuf.DetectorList\"\x00\x12L\n\x0eSelectDetector\x12!.JFJochProtoBuf.DetectorSelection\x1a\x15.JFJochProtoBuf.Empty\"\x00\x62\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  _COMPRESSION._serialized_start=2876
-  _COMPRESSION._serialized_end=2960
-  _DETECTORMODE._serialized_start=2962
-  _DETECTORMODE._serialized_end=3052
-  _STATE._serialized_start=3054
-  _STATE._serialized_end=3148
-  _FPGAPIXELOUTPUT._serialized_start=3150
-  _FPGAPIXELOUTPUT._serialized_end=3223
-  _PLOTTYPE._serialized_start=3225
-  _PLOTTYPE._serialized_end=3348
+  _COMPRESSION._serialized_start=2753
+  _COMPRESSION._serialized_end=2837
+  _DETECTORMODE._serialized_start=2839
+  _DETECTORMODE._serialized_end=2929
+  _STATE._serialized_start=2931
+  _STATE._serialized_end=3025
+  _FPGAPIXELOUTPUT._serialized_start=3027
+  _FPGAPIXELOUTPUT._serialized_end=3100
+  _PLOTTYPE._serialized_start=3102
+  _PLOTTYPE._serialized_end=3225
   _EMPTY._serialized_start=32
   _EMPTY._serialized_end=39
   _UNITCELL._serialized_start=41
@@ -56,20 +56,16 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _RADIALINTEGRATIONPROFILES._serialized_end=1734
   _DATAPROCESSINGSETTINGS._serialized_start=1737
   _DATAPROCESSINGSETTINGS._serialized_end=2052
-  _IMAGE._serialized_start=2054
-  _IMAGE._serialized_end=2127
-  _MASKTOLOAD._serialized_start=2129
-  _MASKTOLOAD._serialized_end=2175
-  _MEASUREMENTSTATISTICS._serialized_start=2178
-  _MEASUREMENTSTATISTICS._serialized_end=2507
-  _BROKERSTATUS._serialized_start=2510
-  _BROKERSTATUS._serialized_end=2647
-  _DETECTORLISTELEMENT._serialized_start=2649
-  _DETECTORLISTELEMENT._serialized_end=2721
-  _DETECTORLIST._serialized_start=2723
-  _DETECTORLIST._serialized_end=2841
-  _DETECTORSELECTION._serialized_start=2843
-  _DETECTORSELECTION._serialized_end=2874
-  _GRPC_JFJOCHBROKER._serialized_start=3351
-  _GRPC_JFJOCHBROKER._serialized_end=4971
+  _MEASUREMENTSTATISTICS._serialized_start=2055
+  _MEASUREMENTSTATISTICS._serialized_end=2384
+  _BROKERSTATUS._serialized_start=2387
+  _BROKERSTATUS._serialized_end=2524
+  _DETECTORLISTELEMENT._serialized_start=2526
+  _DETECTORLISTELEMENT._serialized_end=2598
+  _DETECTORLIST._serialized_start=2600
+  _DETECTORLIST._serialized_end=2718
+  _DETECTORSELECTION._serialized_start=2720
+  _DETECTORSELECTION._serialized_end=2751
+  _GRPC_JFJOCHBROKER._serialized_start=3228
+  _GRPC_JFJOCHBROKER._serialized_end=4594
 # @@protoc_insertion_point(module_scope)
diff --git a/python/jfjoch_pb2_grpc.py b/python/jfjoch_pb2_grpc.py
index d7a6328c..0ba9b983 100644
--- a/python/jfjoch_pb2_grpc.py
+++ b/python/jfjoch_pb2_grpc.py
@@ -94,26 +94,6 @@ class gRPC_JFJochBrokerStub(object):
                 request_serializer=jfjoch__pb2.Empty.SerializeToString,
                 response_deserializer=jfjoch__pb2.RadialIntegrationProfiles.FromString,
                 )
-        self.GetPedestalG0 = channel.unary_unary(
-                '/JFJochProtoBuf.gRPC_JFJochBroker/GetPedestalG0',
-                request_serializer=jfjoch__pb2.Empty.SerializeToString,
-                response_deserializer=jfjoch__pb2.Image.FromString,
-                )
-        self.GetPedestalG1 = channel.unary_unary(
-                '/JFJochProtoBuf.gRPC_JFJochBroker/GetPedestalG1',
-                request_serializer=jfjoch__pb2.Empty.SerializeToString,
-                response_deserializer=jfjoch__pb2.Image.FromString,
-                )
-        self.GetPedestalG2 = channel.unary_unary(
-                '/JFJochProtoBuf.gRPC_JFJochBroker/GetPedestalG2',
-                request_serializer=jfjoch__pb2.Empty.SerializeToString,
-                response_deserializer=jfjoch__pb2.Image.FromString,
-                )
-        self.GetMask = channel.unary_unary(
-                '/JFJochProtoBuf.gRPC_JFJochBroker/GetMask',
-                request_serializer=jfjoch__pb2.Empty.SerializeToString,
-                response_deserializer=jfjoch__pb2.Image.FromString,
-                )
         self.GetDetectorList = channel.unary_unary(
                 '/JFJochProtoBuf.gRPC_JFJochBroker/GetDetectorList',
                 request_serializer=jfjoch__pb2.Empty.SerializeToString,
@@ -225,30 +205,6 @@ class gRPC_JFJochBrokerServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def GetPedestalG0(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetPedestalG1(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetPedestalG2(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetMask(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def GetDetectorList(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -344,26 +300,6 @@ def add_gRPC_JFJochBrokerServicer_to_server(servicer, server):
                     request_deserializer=jfjoch__pb2.Empty.FromString,
                     response_serializer=jfjoch__pb2.RadialIntegrationProfiles.SerializeToString,
             ),
-            'GetPedestalG0': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetPedestalG0,
-                    request_deserializer=jfjoch__pb2.Empty.FromString,
-                    response_serializer=jfjoch__pb2.Image.SerializeToString,
-            ),
-            'GetPedestalG1': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetPedestalG1,
-                    request_deserializer=jfjoch__pb2.Empty.FromString,
-                    response_serializer=jfjoch__pb2.Image.SerializeToString,
-            ),
-            'GetPedestalG2': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetPedestalG2,
-                    request_deserializer=jfjoch__pb2.Empty.FromString,
-                    response_serializer=jfjoch__pb2.Image.SerializeToString,
-            ),
-            'GetMask': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetMask,
-                    request_deserializer=jfjoch__pb2.Empty.FromString,
-                    response_serializer=jfjoch__pb2.Image.SerializeToString,
-            ),
             'GetDetectorList': grpc.unary_unary_rpc_method_handler(
                     servicer.GetDetectorList,
                     request_deserializer=jfjoch__pb2.Empty.FromString,
@@ -656,74 +592,6 @@ class gRPC_JFJochBroker(object):
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
-    @staticmethod
-    def GetPedestalG0(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/JFJochProtoBuf.gRPC_JFJochBroker/GetPedestalG0',
-            jfjoch__pb2.Empty.SerializeToString,
-            jfjoch__pb2.Image.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def GetPedestalG1(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/JFJochProtoBuf.gRPC_JFJochBroker/GetPedestalG1',
-            jfjoch__pb2.Empty.SerializeToString,
-            jfjoch__pb2.Image.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def GetPedestalG2(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/JFJochProtoBuf.gRPC_JFJochBroker/GetPedestalG2',
-            jfjoch__pb2.Empty.SerializeToString,
-            jfjoch__pb2.Image.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def GetMask(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/JFJochProtoBuf.gRPC_JFJochBroker/GetMask',
-            jfjoch__pb2.Empty.SerializeToString,
-            jfjoch__pb2.Image.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
     @staticmethod
     def GetDetectorList(request,
             target,