Revert "Debbugging strategy find where the exception is triggered"

This reverts commit 892c1261a704b50ccf002a638899948313b8ae4d.

Restore the develop branch, so to be able to merge from the feature/branch