diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/CMakeLists.txt b/CEP/DP3/AOFlagger/include/AOFlagger/CMakeLists.txt
index 5f971d5933a808e5c80f54123a5d9441b6aad7eb..060e44f95f38a4bc888b210e7bb3aac322298180 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/CMakeLists.txt
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/CMakeLists.txt
@@ -139,7 +139,6 @@ install(FILES
   strategy/algorithms/frequencypowerplot.h
   strategy/algorithms/fringestoppingfitter.h
   strategy/algorithms/fringetestcreater.h
-  strategy/algorithms/imagetile.h
   strategy/algorithms/localfitmethod.h
   strategy/algorithms/medianwindow.h
   strategy/algorithms/methoditerator.h
@@ -154,7 +153,6 @@ install(FILES
   strategy/algorithms/thresholdconfig.h
   strategy/algorithms/thresholdmitigater.h
   strategy/algorithms/thresholdtools.h
-  strategy/algorithms/tiledimage.h
   strategy/algorithms/timeflagcountplot.h
   strategy/algorithms/timefrequencystatistics.h
   strategy/algorithms/types.h
diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/gui/strategyframes/slidingwindowfitframe.h b/CEP/DP3/AOFlagger/include/AOFlagger/gui/strategyframes/slidingwindowfitframe.h
index 162e37724d67119ffdf8aeafcfb110b9c119fc82..b61b2e898c4552bec21e2833a03d5cd00dc49ee4 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/gui/strategyframes/slidingwindowfitframe.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/gui/strategyframes/slidingwindowfitframe.h
@@ -49,8 +49,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
 		_fitWeightedAverageButton("W.Average"),
 		_fitMedianButton("Median"),
 		_fitMinimumButton("Minimum"),
-		_fitLeastSquareButton("Least squares fit"),
-		_fitLeastAbsButton("Least absolute fit"),
 		_applyButton(Gtk::Stock::APPLY)
 		{
 			initParameterWidgets();
@@ -91,12 +89,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
 		
 			_fitMinimumButton.set_group(methodGroup);
 			_box.pack_start(_fitMinimumButton);
-		
-			_fitLeastSquareButton.set_group(methodGroup);
-			_box.pack_start(_fitLeastSquareButton);
-		
-			_fitLeastAbsButton.set_group(methodGroup);
-			_box.pack_start(_fitLeastAbsButton);
 
 			switch(_action.Parameters().method)
 			{
@@ -115,12 +107,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
 				case rfiStrategy::SlidingWindowFitParameters::Minimum:
 					_fitMinimumButton.set_active(true);
 					break;
-				case rfiStrategy::SlidingWindowFitParameters::LeastSquare:
-					_fitLeastSquareButton.set_active(true);
-					break;
-				case rfiStrategy::SlidingWindowFitParameters::LeastAbs:
-					_fitLeastAbsButton.set_active(true);
-					break;
 			}
 
 			_fitNoneButton.show();
@@ -128,8 +114,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
 			_fitWeightedAverageButton.show();
 			_fitMedianButton.show();
 			_fitMinimumButton.show();
-			_fitLeastSquareButton.show();
-			_fitLeastAbsButton.show();
 		}
 
 		void initScales()
@@ -172,7 +156,7 @@ class SlidingWindowFitFrame : public Gtk::Frame {
 			_hKernelSizeLabel, _vKernelSizeLabel;
 		Gtk::HScale _iterationCountScale;
 		Gtk::RadioButton
-			_fitNoneButton, _fitAverageButton, _fitWeightedAverageButton, _fitMedianButton, _fitMinimumButton, _fitLeastSquareButton, _fitLeastAbsButton;
+			_fitNoneButton, _fitAverageButton, _fitWeightedAverageButton, _fitMedianButton, _fitMinimumButton;
 		Gtk::Button _applyButton;
 
 		void onApplyClicked()
@@ -186,10 +170,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
 				method = rfiStrategy::SlidingWindowFitParameters::Median;
 			else if(_fitMinimumButton.get_active())
 				method = rfiStrategy::SlidingWindowFitParameters::Minimum;
-			else if(_fitLeastSquareButton.get_active())
-				method = rfiStrategy::SlidingWindowFitParameters::LeastSquare;
-			else if(_fitLeastAbsButton.get_active())
-				method = rfiStrategy::SlidingWindowFitParameters::LeastAbs;
 			else
 				method = rfiStrategy::SlidingWindowFitParameters::None;
 			_action.Parameters().method = method;
diff --git a/CEP/DP3/AOFlagger/src/CMakeLists.txt b/CEP/DP3/AOFlagger/src/CMakeLists.txt
index 1ea1a3dda01517abcc658ec03c8a60b1d6b8da3f..dcd36490ccf11d923c869c2cdd36e4602edac591 100644
--- a/CEP/DP3/AOFlagger/src/CMakeLists.txt
+++ b/CEP/DP3/AOFlagger/src/CMakeLists.txt
@@ -76,7 +76,6 @@ set(STRATEGY_ALGORITHMS_FILES
   strategy/algorithms/frequencypowerplot.cpp
   strategy/algorithms/fringestoppingfitter.cpp
   strategy/algorithms/fringetestcreater.cpp
-  strategy/algorithms/imagetile.cpp
   strategy/algorithms/localfitmethod.cpp
   strategy/algorithms/methoditerator.cpp
   strategy/algorithms/mitigationtester.cpp
@@ -89,7 +88,6 @@ set(STRATEGY_ALGORITHMS_FILES
   strategy/algorithms/thresholdconfig.cpp
   strategy/algorithms/thresholdmitigater.cpp
   strategy/algorithms/thresholdtools.cpp
-  strategy/algorithms/tiledimage.cpp
   strategy/algorithms/timeflagcountplot.cpp
   strategy/algorithms/timefrequencystatistics.cpp)