Index: wflow-py/Sandbox/wflow_HRU_test.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_HRU_test.py	(.../wflow_HRU_test.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_HRU_test.py	(.../wflow_HRU_test.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -23,7 +23,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import getopt
 
 from wflow.wf_DynamicFramework import *
Index: wflow-py/Sandbox/wflow_mswat.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_mswat.py	(.../wflow_mswat.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_mswat.py	(.../wflow_mswat.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -19,7 +19,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/Sandbox/wflow_musle.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_musle.py	(.../wflow_musle.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_musle.py	(.../wflow_musle.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -19,7 +19,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import getopt
 
 from wflow.wf_DynamicFramework import *
Index: wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py	(.../reservoir_Sus.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py	(.../reservoir_Sus.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -10,13 +10,11 @@
 """
 
 
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from wf_DynamicFramework import *
-import scipy
 
 
 def selectSusR(i):
Index: wflow-py/Sandbox/wflow_usle.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_usle.py	(.../wflow_usle.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_usle.py	(.../wflow_usle.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -43,7 +43,6 @@
 
 """
 
-import numpy
 import getopt
 
 from wflow.wf_DynamicFramework import *
Index: wflow-py/Sandbox/wflow_vegetation.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_vegetation.py	(.../wflow_vegetation.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_vegetation.py	(.../wflow_vegetation.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -20,7 +20,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import getopt
 
 from wflow.wf_DynamicFramework import *
Index: wflow-py/Sandbox/wflow_w3.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_w3.py	(.../wflow_w3.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_w3.py	(.../wflow_w3.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -30,7 +30,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/Sandbox/wflow_w3ra_v2.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Sandbox/wflow_w3ra_v2.py	(.../wflow_w3ra_v2.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Sandbox/wflow_w3ra_v2.py	(.../wflow_w3ra_v2.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -30,7 +30,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/Scripts/area_in_out.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/area_in_out.py	(.../area_in_out.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Scripts/area_in_out.py	(.../area_in_out.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -16,7 +16,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import getopt
 
 try:
@@ -28,7 +27,6 @@
     from wflow.wflow_adapt import *
 except ImportError:
     from wflow_adapt import *
-import scipy
 
 
 def usage(*args):
Index: wflow-py/Scripts/bmi2runner.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/bmi2runner.py	(.../bmi2runner.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Scripts/bmi2runner.py	(.../bmi2runner.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -21,7 +21,6 @@
     wflow_sbm@InwaterMM=wflow_routing@IW
 
 """
-import wflow
 import wflow.wflow_bmi_combined as wfbmi
 import wflow.pcrut as pcrut
 import sys
Index: wflow-py/Scripts/mapstack.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/mapstack.py	(.../mapstack.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Scripts/mapstack.py	(.../mapstack.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -13,7 +13,6 @@
 
 """
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/Scripts/wfds_core.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/wfds_core.py	(.../wfds_core.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Scripts/wfds_core.py	(.../wfds_core.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -20,7 +20,6 @@
   --bmi-class              when used - the engine is assumed to be the full name of a Python class that implements bmi [default: bmi.wrapper.BMIWrapper]
 
 """
-import bmi
 import mmi.runner
 
 
Index: wflow-py/Scripts/wflow_prepare_step1.py
===================================================================
diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/wflow_prepare_step1.py	(.../wflow_prepare_step1.py)	(revision f33154035afcaa101c5a30594b9c86a4fe9f61ef)
+++ wflow-py/Scripts/wflow_prepare_step1.py	(.../wflow_prepare_step1.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -43,7 +43,6 @@
 import configparser
 import sys
 import gc
-import numpy as np
 
 
 def usage(*args):
Index: wflow-py/Scripts/wflow_prepare_step2.py
===================================================================
diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/wflow_prepare_step2.py	(.../wflow_prepare_step2.py)	(revision f33154035afcaa101c5a30594b9c86a4fe9f61ef)
+++ wflow-py/Scripts/wflow_prepare_step2.py	(.../wflow_prepare_step2.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -31,7 +31,6 @@
 import getopt
 import configparser
 import sys
-import numpy as np
 
 tr.Verbose = 1
 
Index: wflow-py/Scripts/wflow_sbm_rtc.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/wflow_sbm_rtc.py	(.../wflow_sbm_rtc.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Scripts/wflow_sbm_rtc.py	(.../wflow_sbm_rtc.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -3,7 +3,6 @@
 # <h1>Basic test of the wflow BMI interface + reservoir
 
 # In[10]:
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/Scripts/wflow_subcatch.py
===================================================================
diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/wflow_subcatch.py	(.../wflow_subcatch.py)	(revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0)
+++ wflow-py/Scripts/wflow_subcatch.py	(.../wflow_subcatch.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -36,7 +36,6 @@
 
 
 from wflow.wflow_lib import *
-import wflow.pcrut as pcrut
 
 
 import os, sys, shlex, time
Index: wflow-py/Scripts/wtools_py/CatchRiver.py
===================================================================
diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/Scripts/wtools_py/CatchRiver.py	(.../CatchRiver.py)	(revision f33154035afcaa101c5a30594b9c86a4fe9f61ef)
+++ wflow-py/Scripts/wtools_py/CatchRiver.py	(.../CatchRiver.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -15,7 +15,6 @@
 import numpy as np
 from osgeo import ogr
 from osgeo import gdal
-from osgeo.gdalconst import *
 
 import wflow.wflowtools_lib as wt
 
Index: wflow-py/UnitTests/TestBMI_bmi2runner.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/UnitTests/TestBMI_bmi2runner.py	(.../TestBMI_bmi2runner.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/UnitTests/TestBMI_bmi2runner.py	(.../TestBMI_bmi2runner.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -7,7 +7,6 @@
 sys.path = ["../Scripts"] + sys.path
 import bmi2runner as bmirun
 import os
-import wflow_bmi_combined as bmi
 
 """
 Simple test for wflow bmi framework
Index: wflow-py/UnitTests/TestBMI_bmi2runner2.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/UnitTests/TestBMI_bmi2runner2.py	(.../TestBMI_bmi2runner2.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/UnitTests/TestBMI_bmi2runner2.py	(.../TestBMI_bmi2runner2.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -5,7 +5,6 @@
 
 sys.path = ["../wflow"] + ["../"] + sys.path
 sys.path = ["../Scripts"] + sys.path
-import bmi2runner as bmirun
 import wflow_bmi_combined as bmi
 
 """
Index: wflow-py/openda_bmi/opendapy.py
===================================================================
diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/openda_bmi/opendapy.py	(.../opendapy.py)	(revision 36b469410a4a5af24c3902cbebb595e9da83c7bb)
+++ wflow-py/openda_bmi/opendapy.py	(.../opendapy.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -12,7 +12,7 @@
 
 from openda_bmi.openda.bmi.thrift.BMIService import Iface
 from openda_bmi.openda.bmi.thrift.BMIService import Processor
-from openda_bmi.openda.bmi.thrift.ttypes import ModelException, BmiGridType
+from openda_bmi.openda.bmi.thrift.ttypes import ModelException
 
 import sys
 import signal
Index: wflow-py/openda_bmi/thrift_bmi_raster_server.py
===================================================================
diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/openda_bmi/thrift_bmi_raster_server.py	(.../thrift_bmi_raster_server.py)	(revision 36b469410a4a5af24c3902cbebb595e9da83c7bb)
+++ wflow-py/openda_bmi/thrift_bmi_raster_server.py	(.../thrift_bmi_raster_server.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -12,7 +12,7 @@
 
 from openda_bmi.openda.bmi.thrift.BMIService import Iface
 from openda_bmi.openda.bmi.thrift.BMIService import Processor
-from openda_bmi.openda.bmi.thrift.ttypes import ModelException, BmiGridType
+from openda_bmi.openda.bmi.thrift.ttypes import ModelException
 
 import sys
 import signal
Index: wflow-py/wflow/JarvisCoefficients.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/JarvisCoefficients.py	(.../JarvisCoefficients.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/JarvisCoefficients.py	(.../JarvisCoefficients.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -16,13 +16,11 @@
 Calculations based on Zhou et al 2006 and Stewart 1998
 """
 
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from .wf_DynamicFramework import *
-import scipy
 
 
 def calcEp(self, k):
Index: wflow-py/wflow/ops_scalar2grid.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/ops_scalar2grid.py	(.../ops_scalar2grid.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/ops_scalar2grid.py	(.../ops_scalar2grid.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -17,9 +17,7 @@
 
 """
 
-import numpy
 import getopt
-import wflow.pcrut as pcrut
 
 from wflow.wf_DynamicFramework import *
 from wflow.wflow_adapt import *
Index: wflow-py/wflow/pcrglobwb/groundwater.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/pcrglobwb/groundwater.py	(.../groundwater.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/pcrglobwb/groundwater.py	(.../groundwater.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -35,7 +35,6 @@
 from . import virtualOS as vos
 from .ncConverter import *
 
-from wflow.wf_DynamicFramework import configsection
 from wflow.wf_DynamicFramework import configget
 
 
Index: wflow-py/wflow/pcrglobwb/landCover.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/pcrglobwb/landCover.py	(.../landCover.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/pcrglobwb/landCover.py	(.../landCover.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -23,7 +23,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import netCDF4 as nc
 import pcraster as pcr
 
 import logging
@@ -33,7 +32,6 @@
 from . import virtualOS as vos
 from .ncConverter import *
 
-from wflow.wf_DynamicFramework import configsection
 from wflow.wf_DynamicFramework import configget
 
 
Index: wflow-py/wflow/pcrglobwb/routing.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/pcrglobwb/routing.py	(.../routing.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/pcrglobwb/routing.py	(.../routing.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -36,7 +36,6 @@
 
 from . import waterBodies
 
-from wflow.wf_DynamicFramework import configsection
 from wflow.wf_DynamicFramework import configget
 from wflow.wflow_lib import getgridparams
 
Index: wflow-py/wflow/pcrglobwb/virtualOS.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/pcrglobwb/virtualOS.py	(.../virtualOS.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/pcrglobwb/virtualOS.py	(.../virtualOS.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -42,7 +42,6 @@
 import numpy.ma as ma
 import pcraster as pcr
 
-from wflow.wflow_lib import getgridparams, getrows
 
 import logging
 
Index: wflow-py/wflow/pcrglobwb/waterBodies.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/pcrglobwb/waterBodies.py	(.../waterBodies.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/pcrglobwb/waterBodies.py	(.../waterBodies.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -23,7 +23,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from pcraster.framework import *
 import pcraster as pcr
 
 import logging
@@ -32,7 +31,6 @@
 
 from . import virtualOS as vos
 
-from wflow.wf_DynamicFramework import configsection
 from wflow.wf_DynamicFramework import configget
 
 
Index: wflow-py/wflow/reservoir_Sa.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/reservoir_Sa.py	(.../reservoir_Sa.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/reservoir_Sa.py	(.../reservoir_Sa.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -14,13 +14,11 @@
 List all function versions
 """
 
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from .wf_DynamicFramework import *
-import scipy
 from . import JarvisCoefficients
 
 
Index: wflow-py/wflow/reservoir_Sf.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/reservoir_Sf.py	(.../reservoir_Sf.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/reservoir_Sf.py	(.../reservoir_Sf.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -7,13 +7,11 @@
 List all function versions
 """
 
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from .wf_DynamicFramework import *
-import scipy
 
 
 def selectSfR(i):
Index: wflow-py/wflow/reservoir_Si.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/reservoir_Si.py	(.../reservoir_Si.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/reservoir_Si.py	(.../reservoir_Si.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -6,7 +6,6 @@
 
 List all function versions
 """
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
Index: wflow-py/wflow/reservoir_Ss.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/reservoir_Ss.py	(.../reservoir_Ss.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/reservoir_Ss.py	(.../reservoir_Ss.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -10,13 +10,11 @@
 in h:\My Documents\memo's\python scripts\wflow\
 """
 
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from .wf_DynamicFramework import *
-import scipy
 
 
 def groundWater_no_reservoir(self):
Index: wflow-py/wflow/reservoir_Su.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/reservoir_Su.py	(.../reservoir_Su.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/reservoir_Su.py	(.../reservoir_Su.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -13,7 +13,6 @@
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from .wf_DynamicFramework import *
-import scipy
 from . import JarvisCoefficients
 
 
Index: wflow-py/wflow/reservoir_Sw.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/reservoir_Sw.py	(.../reservoir_Sw.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/reservoir_Sw.py	(.../reservoir_Sw.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -7,13 +7,11 @@
 List all function versions
 """
 
-import numpy
 
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
     from .wf_DynamicFramework import *
-import scipy
 from . import JarvisCoefficients
 
 
Index: wflow-py/wflow/wf_DynamicFramework.py
===================================================================
diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0)
+++ wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -16,7 +16,6 @@
 import configparser
 
 from wflow.wf_netcdfio import *
-import wflow
 from . import pcrut
 import glob
 import traceback
Index: wflow-py/wflow/wf_netcdfio.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wf_netcdfio.py	(.../wf_netcdfio.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wf_netcdfio.py	(.../wf_netcdfio.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -20,7 +20,6 @@
 from numpy import *
 import time
 import datetime as dt
-import wflow.wflow_lib as wflow_lib
 import wflow.pcrut as _pcrut
 
 globmetadata = {}
Index: wflow-py/wflow/wflow_bmi.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_bmi.py	(.../wflow_bmi.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_bmi.py	(.../wflow_bmi.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -5,7 +5,6 @@
 import datetime
 
 import wflow.bmi as bmi
-from . import wflow_lib
 import numpy as np
 from wflow.pcrut import setlogger
 
Index: wflow-py/wflow/wflow_bmi_combined.py
===================================================================
diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_bmi_combined.py	(.../wflow_bmi_combined.py)	(revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0)
+++ wflow-py/wflow/wflow_bmi_combined.py	(.../wflow_bmi_combined.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -4,7 +4,6 @@
 import wflow
 import os
 from wflow.pcrut import setlogger
-from wflow.wflow_lib import configget
 import configparser
 import logging
 import numpy as np
Index: wflow-py/wflow/wflow_bmi_combined_mp.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_bmi_combined_mp.py	(.../wflow_bmi_combined_mp.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_bmi_combined_mp.py	(.../wflow_bmi_combined_mp.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -1,9 +1,7 @@
 import wflow.bmi as bmi
 import wflow.wflow_bmi as wfbmi
-import wflow
 import os
 from wflow.pcrut import setlogger
-from wflow.wflow_lib import configget
 import configparser
 import logging
 from pcraster import *
Index: wflow-py/wflow/wflow_cqf.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_cqf.py	(.../wflow_cqf.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_cqf.py	(.../wflow_cqf.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -106,7 +106,6 @@
 from wflow.wflow_funcs import *
 from wflow.wflow_adapt import *
 
-import scipy
 
 
 wflow = "wflow_cqf: "
Index: wflow-py/wflow/wflow_extract.py
===================================================================
diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_extract.py	(.../wflow_extract.py)	(revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0)
+++ wflow-py/wflow/wflow_extract.py	(.../wflow_extract.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -35,7 +35,6 @@
 
 
 from wflow.wflow_lib import *
-import wflow.pcrut as pcrut
 import sys
 import os
 import os.path
Index: wflow-py/wflow/wflow_fit.py
===================================================================
diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_fit.py	(.../wflow_fit.py)	(revision f33154035afcaa101c5a30594b9c86a4fe9f61ef)
+++ wflow-py/wflow/wflow_fit.py	(.../wflow_fit.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -59,7 +59,6 @@
 """
 
 
-import matplotlib
 import pylab
 import scipy.optimize
 
Index: wflow-py/wflow/wflow_fit_brute.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_fit_brute.py	(.../wflow_fit_brute.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_fit_brute.py	(.../wflow_fit_brute.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -59,20 +59,17 @@
 """
 
 
-import scipy.optimize
 
 import wflow.pcrut as pcrut
 import wflow.stats as stats
 
 
 import os.path
 import numpy as np
-import matplotlib
 import pylab
 import getopt
 import sys
 import csv
-import itertools
 
 
 # TODO: do not read results from file
Index: wflow-py/wflow/wflow_floodmap.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_floodmap.py	(.../wflow_floodmap.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_floodmap.py	(.../wflow_floodmap.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -58,7 +58,6 @@
 
 # TODO: update to update framework
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/wflow/wflow_hbvl.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_hbvl.py	(.../wflow_hbvl.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_hbvl.py	(.../wflow_hbvl.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -74,7 +74,6 @@
 
 """
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/wflow/wflow_lib.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_lib.py	(.../wflow_lib.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_lib.py	(.../wflow_lib.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -40,12 +40,9 @@
 
 import osgeo.gdal as gdal
 from osgeo.gdalconst import *
-import pcraster
 from pcraster import *
 from pcraster.framework import *
-import scipy
 import numpy as np
-import netCDF4 as nc4
 import gzip, zipfile
 
 
Index: wflow-py/wflow/wflow_lintul.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_lintul.py	(.../wflow_lintul.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_lintul.py	(.../wflow_lintul.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -3,7 +3,6 @@
 
 from math import pi
 import math
-import numpy as np
 import os
 import os.path
 import getopt
Index: wflow-py/wflow/wflow_pcrglobwb.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_pcrglobwb.py	(.../wflow_pcrglobwb.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_pcrglobwb.py	(.../wflow_pcrglobwb.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -85,7 +85,6 @@
 
 """
 
-import numpy
 
 # import pcrut
 import sys
Index: wflow-py/wflow/wflow_sceleton.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_sceleton.py	(.../wflow_sceleton.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_sceleton.py	(.../wflow_sceleton.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -18,7 +18,6 @@
 
 """
 
-import numpy
 import getopt
 
 from wflow.wf_DynamicFramework import *
Index: wflow-py/wflow/wflow_snow.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_snow.py	(.../wflow_snow.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_snow.py	(.../wflow_snow.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -56,13 +56,10 @@
 """
 
 
-import numpy
 import os
 import os.path
 import getopt
 from wflow.wf_DynamicFramework import *
-import scipy
-import wflow.wflow_adapt as wflow_adapt
 import wflow.pcrut as pcrut
 
 
Index: wflow-py/wflow/wflow_sphy.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_sphy.py	(.../wflow_sphy.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_sphy.py	(.../wflow_sphy.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -19,7 +19,6 @@
 # TODO: split off routing
 
 
-import numpy
 import sys
 import os
 import os.path
Index: wflow-py/wflow/wflow_topoflex.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_topoflex.py	(.../wflow_topoflex.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_topoflex.py	(.../wflow_topoflex.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -16,15 +16,7 @@
 
 """
 
-import wflow.reservoir_Si as reservoir_Si
-import wflow.reservoir_Sa as reservoir_Sa
-import wflow.reservoir_Sw as reservoir_Sw
-import wflow.reservoir_Su as reservoir_Su
-import wflow.reservoir_Sf as reservoir_Sf
-import wflow.reservoir_Ss as reservoir_Ss
-import wflow.JarvisCoefficients as JarvisCoefficients
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/wflow/wflow_upscale.py
===================================================================
diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_upscale.py	(.../wflow_upscale.py)	(revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0)
+++ wflow-py/wflow/wflow_upscale.py	(.../wflow_upscale.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -43,7 +43,6 @@
 
 
 from wflow.wflow_lib import *
-import wflow.pcrut as pcrut
 
 
 import os, sys, shlex, time
Index: wflow-py/wflow/wflow_w3ra.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_w3ra.py	(.../wflow_w3ra.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_w3ra.py	(.../wflow_w3ra.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -36,7 +36,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import os
 import os.path
 import getopt
Index: wflow-py/wflow/wflow_w3ra_new.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85
--- wflow-py/wflow/wflow_w3ra_new.py	(.../wflow_w3ra_new.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/wflow/wflow_w3ra_new.py	(.../wflow_w3ra_new.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
@@ -32,7 +32,6 @@
 $Rev: 898 $
 """
 
-import numpy
 import os
 import os.path
 import getopt