Index: examples/openstreams_w3ra_usa/wflow_W3RA.ini
===================================================================
diff -u -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 -r1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5
--- examples/openstreams_w3ra_usa/wflow_W3RA.ini	(.../wflow_W3RA.ini)	(revision 581f7ef740683f20ecabb30a6e35b8c23025a4d4)
+++ examples/openstreams_w3ra_usa/wflow_W3RA.ini	(.../wflow_W3RA.ini)	(revision 1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5)
@@ -89,16 +89,7 @@
 [misc]
 #mapSaveInterval=365
 
-[framework]
-# outputformat for the *dynamic* mapstacks (not the states and summary maps)
-# 1: pcraster
-# 2: numpy
-# 3: matlab
 
-# netcdfoutput requires also outputformat = 1 (default) and additionally the name of the file
-#netcdfoutput = outmaps.nc
-#netcdfwritebuffer=100
-
 [layout]
 # if set to zero the cell-size is given in lat/long (the default)
 sizeinmetres = 0
Index: examples/wflow_rhine_sbm/wflow_sbm.ini
===================================================================
diff -u -r56444ad625e94224d6a538f21ab05318dedf4b10 -r1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5
--- examples/wflow_rhine_sbm/wflow_sbm.ini	(.../wflow_sbm.ini)	(revision 56444ad625e94224d6a538f21ab05318dedf4b10)
+++ examples/wflow_rhine_sbm/wflow_sbm.ini	(.../wflow_sbm.ini)	(revision 1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5)
@@ -211,7 +211,6 @@
 Interception = 1, mm/timestep
 ActEvap = 1, mm/timestep
 SurfaceRunoffCatchmentMM = 1, mm/timestep
-ActEvap = 1, mm/timestep
 ExcessWater = 1, mm/timestep
 InfiltExcess = 1, mm/timestep
 ActInfilt = 1, mm/timestep
Index: wflow-py/UnitTests/combined/wflow_W3RA.ini
===================================================================
diff -u -r00ef8178f6ccf04e542c869caa35837fd08279b5 -r1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5
--- wflow-py/UnitTests/combined/wflow_W3RA.ini	(.../wflow_W3RA.ini)	(revision 00ef8178f6ccf04e542c869caa35837fd08279b5)
+++ wflow-py/UnitTests/combined/wflow_W3RA.ini	(.../wflow_W3RA.ini)	(revision 1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5)
@@ -91,16 +91,7 @@
 [misc]
 #mapSaveInterval=365
 
-[framework]
-# outputformat for the *dynamic* mapstacks (not the states and summary maps)
-# 1: pcraster
-# 2: numpy
-# 3: matlab
 
-# netcdfoutput requires also outputformat = 1 (default) and additionally the name of the file
-#netcdfoutput = outmaps.nc
-#netcdfwritebuffer=100
-
 [layout]
 # if set to zero the cell-size is given in lat/long (the default)
 sizeinmetres = 0
Index: wflow-py/UnitTests/wflow_hbv/wflow_hbv_hr.ini
===================================================================
diff -u -rce599a21046a69d80b7c251c236dfd2143fefbf1 -r1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5
--- wflow-py/UnitTests/wflow_hbv/wflow_hbv_hr.ini	(.../wflow_hbv_hr.ini)	(revision ce599a21046a69d80b7c251c236dfd2143fefbf1)
+++ wflow-py/UnitTests/wflow_hbv/wflow_hbv_hr.ini	(.../wflow_hbv_hr.ini)	(revision 1e5ef7d15bb9b9abaf4557f4bf56a0e2f0989cc5)
@@ -114,6 +114,6 @@
 self.Precipitation=P.csv
 self.watbal=watbal.csv
 
-[outputcsv_0]
+[outputcsv_1]
 samplemap=staticmaps/wflow_gauges.map
 self.SurfaceRunoff=run.csv