Adapted simulation parameters; removed DeathWatch in router