diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2
index 09580928..ec6b7ae7 100644
--- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/incoming_foreign_dom/0007_test.yml.tt2 b/scenarios/incoming_foreign_dom/0007_test.yml.tt2
index f33eef29..868a94ef 100644
--- a/scenarios/incoming_foreign_dom/0007_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0007_test.yml.tt2
@@ -22,4 +22,4 @@ sip_out:
       'Content-Length: 0',
       'From: <sip:external@external.test>',
       'To: <sip:4311003@'
-    ]
\ No newline at end of file
+    ]
diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2
index 15d8cc7e..70f58765 100644
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ b/scenarios/incoming_peer/0003_test.yml.tt2
@@ -57,10 +57,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/incoming_peer/0007_test.yml.tt2 b/scenarios/incoming_peer/0007_test.yml.tt2
index 79fcb77f..c9a45b4c 100644
--- a/scenarios/incoming_peer/0007_test.yml.tt2
+++ b/scenarios/incoming_peer/0007_test.yml.tt2
@@ -22,4 +22,4 @@ sip_out:
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
-    ]
\ No newline at end of file
+    ]
diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2
index 48043863..b8c5e696 100644
--- a/scenarios/invite/0005_test.yml.tt2
+++ b/scenarios/invite/0005_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
index 1f79e4b6..be7cac9a 100644
--- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
@@ -70,10 +70,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
index 12c48d8e..a9785e30 100644
--- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
@@ -69,10 +69,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
index 36ea4287..4611e267 100644
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@@ -70,10 +70,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
index 2491236a..577019b1 100644
--- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
@@ -61,10 +61,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index 2383c8cc..ba530b2c 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -61,10 +61,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2
index 2a3bdc78..539bffe7 100644
--- a/scenarios/invite_callforward/0025_test.yml.tt2
+++ b/scenarios/invite_callforward/0025_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2
index 0ddee574..181b0fb7 100644
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@@ -61,10 +61,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_concurrent_max/0007_test.yml.tt2 b/scenarios/invite_concurrent_max/0007_test.yml.tt2
index bce24443..275e4bdf 100644
--- a/scenarios/invite_concurrent_max/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2
@@ -69,10 +69,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
index 48043863..b8c5e696 100644
--- a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
index 5c70bc25..821f1b94 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
index 4da2ae13..64c11e86 100644
--- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
@@ -69,10 +69,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_foreign_dom/0003_test.yml.tt2 b/scenarios/invite_foreign_dom/0003_test.yml.tt2
index fd757045..1452f77b 100644
--- a/scenarios/invite_foreign_dom/0003_test.yml.tt2
+++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2
@@ -56,10 +56,8 @@ flow:
   - end|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
index 48043863..b8c5e696 100644
--- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_no_refer/0005_test.yml.tt2 b/scenarios/invite_no_refer/0005_test.yml.tt2
index f80a6d7c..50569a9b 100644
--- a/scenarios/invite_no_refer/0005_test.yml.tt2
+++ b/scenarios/invite_no_refer/0005_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2
index e918b94b..cd71ff33 100644
--- a/scenarios/invite_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_peerout/0003_test.yml.tt2
@@ -64,10 +64,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
index 1270e13f..06caaaed 100644
--- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
@@ -70,10 +70,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_APPLY_CALLER_RWR_FIRST:
   - start|ROUTE_APPLY_REWRITE_RULE:
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
index 8ca3a4ff..bb383e87 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
@@ -72,10 +72,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_APPLY_CALLER_RWR_FIRST:
   - start|ROUTE_APPLY_REWRITE_RULE:
diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2
index f4feaa4b..fe8e4a57 100644
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@@ -62,10 +62,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
@@ -129,10 +127,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2
index ef254a39..743bee00 100644
--- a/scenarios/invite_speeddial/0007_test.yml.tt2
+++ b/scenarios/invite_speeddial/0007_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios/invite_speeddial/0016_test.yml.tt2
index 7315e7d5..71065405 100644
--- a/scenarios/invite_speeddial/0016_test.yml.tt2
+++ b/scenarios/invite_speeddial/0016_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_tcp_udp/0005_test.yml.tt2 b/scenarios/invite_tcp_udp/0005_test.yml.tt2
index b594a616..a93bbd09 100644
--- a/scenarios/invite_tcp_udp/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2
@@ -63,10 +63,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
diff --git a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
index 0b5dc37b..faeb2520 100644
--- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
@@ -62,10 +62,8 @@ flow:
   - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
   - start|ROUTE_PREPARE_MOH:
   - end|ROUTE_PREPARE_MOH:
-[% END -%]
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI: