diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index bf96dcbb5ca2f6172ad848ba2dfb70538501a76a..8c3b8639c9ddce224700e074483f17f213a13b05 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -169,7 +169,6 @@ public:
 
     //! The lower and upper bound of the region of interest. If no region of interest is explicitly
     //! defined, then the whole detector is taken as "region of interest".
-    // #baROI add unit test for no ROI (whether internal comparison to 0/0 works...)
     std::pair<double, double> regionOfInterestBounds(size_t iAxis) const;
 
 protected:
diff --git a/Device/Mask/DetectorMask.cpp b/Device/Mask/DetectorMask.cpp
index cf3991ea5a3c8b952e56f5af670e2d10ae71e4ba..fd5dd2f9707d573194df879cd349863d429ee1e2 100644
--- a/Device/Mask/DetectorMask.cpp
+++ b/Device/Mask/DetectorMask.cpp
@@ -103,7 +103,6 @@ void DetectorMask::process_masks()
         Bin1D binx = m_mask_data.getAxisBin(index, 0);
         Bin1D biny = m_mask_data.getAxisBin(index, 1);
         // setting mask to the data starting from last shape added
-        // #baROI refactor reverse iterator and not two vectors but a struct/pair
         bool is_masked(false);
         for (size_t i_shape = m_shapes.size(); i_shape > 0; --i_shape) {
             const IShape2D* shape = m_shapes[i_shape - 1].get();
diff --git a/Tests/Unit/Core/PythonFormattingTest.cpp b/Tests/Unit/Core/PythonFormattingTest.cpp
index 4d887a593b9907038be42abce615003318e6bf3b..7e31a2e3675b5e1c29091a584e24dd6d0af0306b 100644
--- a/Tests/Unit/Core/PythonFormattingTest.cpp
+++ b/Tests/Unit/Core/PythonFormattingTest.cpp
@@ -166,9 +166,6 @@ TEST_F(PythonFormattingTest, printLayerRoughness)
 
 TEST_F(PythonFormattingTest, printFormFactors)
 {
-    // #baPool missing:    class ReCoreShell;
-    // #baPool missing:    class ReMesocrystal;
-
     EXPECT_EQ(FormFactorPyramid2(12.0, 14.0, 5.0, 55 * Units::deg).pythonConstructor(),
               "FormFactorPyramid2(12*nm, 14*nm, 5*nm, 55*deg)");