Revert "refactorings and simplifications, also changed the internal watchdog to check a lot more frequently to track down a bug"

This reverts commit ea1291043a5083fde2ee39e09d664ff8c9ec9743.
reapply refactorings without the watchdog changes