From 29b2d3a3da9d1ed8e2a4dcf9382a9ace59395e77 Mon Sep 17 00:00:00 2001
From: Ibrahim Cesar <ibracnb@amazon.com>
Date: Tue, 11 Feb 2025 16:49:44 -0300
Subject: [PATCH 1/4] fix: multilanguage support, added Content-Security-Policy

---
 config.toml                                   |  1 -
 layouts/partials/custom-comments.html         |  2 +-
 layouts/partials/custom-header.html           |  9 +++++++-
 layouts/partials/menu.html                    |  4 ++--
 .../layouts/partials/menu-footer.html         |  2 +-
 themes/learn/layouts/partials/footer.html     | 22 +++++++++----------
 themes/learn/layouts/partials/menu.html       |  4 ++--
 themes/learn/layouts/partials/search.html     |  2 +-
 8 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/config.toml b/config.toml
index be4415603..0c672f6e2 100644
--- a/config.toml
+++ b/config.toml
@@ -37,7 +37,6 @@ base_github_url = "https://github.com/awslabs/aws-well-architected-labs/tree/mas
 base_raw_github_url = "https://raw.githubusercontent.com/awslabs/aws-well-architected-labs/master/"
 #{{% siteparam "base_github_url" %}}
 
-
 [minify]
   disableCSS = false
   disableHTML = false
diff --git a/layouts/partials/custom-comments.html b/layouts/partials/custom-comments.html
index 91066ecc6..d12e3e1ff 100644
--- a/layouts/partials/custom-comments.html
+++ b/layouts/partials/custom-comments.html
@@ -4,6 +4,6 @@
        <li><a href="https://aws.amazon.com/privacy/?nc1=f_pr">Privacy</a></li>
        <li>|</li>
        <li><a href="https://aws.amazon.com/terms/?nc1=f_pr">Site Terms |</a></li>
-       <li>© 2023, Amazon Web Services, Inc. or its affiliates. All rights reserved.</li>
+       <li>© <script>document.write(new Date().getFullYear());</script>, Amazon Web Services, Inc. or its affiliates. All rights reserved.</li>
       </ul>
     </div>
diff --git a/layouts/partials/custom-header.html b/layouts/partials/custom-header.html
index 7fa5fbb3e..9f6470bf7 100644
--- a/layouts/partials/custom-header.html
+++ b/layouts/partials/custom-header.html
@@ -6,4 +6,11 @@
 <style type="text/css">
   @import url("/css/jquery-ui.min.css");
 </style>
-<script src="/js/jquery-ui-1.13.1.min.js?1599857491"></script>
+<script type="text/javascript" src="/js/jquery-ui-1.12.1.min.js"></script>
+<meta 
+  http-equiv="Content-Security-Policy" 
+  content="default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; upgrade-insecure-requests;"
+>
+
+
+
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 7b9131ef4..7375ba91e 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -38,11 +38,11 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
       </section>
     {{end}}
 
-    {{ if or .Site.IsMultiLingual $showvisitedlinks }}
+    {{ if or hugo.IsMultilingual $showvisitedlinks }}
     <section id="prefooter">
       <hr/>
       <ul>
-      {{ if and .Site.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton)}}
+      {{ if and hugo.IsMultilingual (not .Site.Params.DisableLanguageSwitchingButton)}}
         <li>
           <a class="padding">
             <i class="fas fa-language fa-fw"></i>
diff --git a/themes/learn/exampleSite/layouts/partials/menu-footer.html b/themes/learn/exampleSite/layouts/partials/menu-footer.html
index 5a35bd00f..e2c6e10bd 100644
--- a/themes/learn/exampleSite/layouts/partials/menu-footer.html
+++ b/themes/learn/exampleSite/layouts/partials/menu-footer.html
@@ -11,4 +11,4 @@
     <p>Built with <a href="https://github.com/matcornic/hugo-theme-learn"><i class="fas fa-heart"></i></a> from <a href="https://getgrav.org">Grav</a> and <a href="https://gohugo.io/">Hugo</a></p>
 </center>
 <!-- Place this tag in your head or just before your close body tag. -->
-<script async defer src="https://buttons.github.io/buttons.js"></script>
+<script type="text/javascript" async defer src="https://buttons.github.io/buttons.js"></script>
diff --git a/themes/learn/layouts/partials/footer.html b/themes/learn/layouts/partials/footer.html
index 0ae30f7ce..c328400fa 100644
--- a/themes/learn/layouts/partials/footer.html
+++ b/themes/learn/layouts/partials/footer.html
@@ -56,19 +56,19 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="{{"js/clipboard.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/jquery.sticky.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/featherlight.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/highlight.pack.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/clipboard.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/jquery.sticky.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/featherlight.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/highlight.pack.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="{{"js/modernizr.custom-3.6.0.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/hugo-learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/modernizr.custom-3.6.0.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script type="text/javascript" src="{{"js/hugo-learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
 
-    <link href="{{"mermaid/mermaid.css" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" />
-    <script src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <link type="text/css" href="{{"mermaid/mermaid.css" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" />
+    <script type="text/javascript" src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/themes/learn/layouts/partials/menu.html b/themes/learn/layouts/partials/menu.html
index 0deb999b6..8c79bd055 100644
--- a/themes/learn/layouts/partials/menu.html
+++ b/themes/learn/layouts/partials/menu.html
@@ -39,11 +39,11 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
       </section>
     {{end}}
 
-    {{ if or .Site.IsMultiLingual $showvisitedlinks }}
+    {{ if or hugo.IsMultiLingual $showvisitedlinks }}
     <section id="prefooter">
       <hr/>
       <ul>
-      {{ if and .Site.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton)}}
+      {{ if and hugo.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton)}}
         <li>
           <a class="padding">
             <i class="fas fa-language fa-fw"></i>
diff --git a/themes/learn/layouts/partials/search.html b/themes/learn/layouts/partials/search.html
index 41daf84b9..53d5694ba 100644
--- a/themes/learn/layouts/partials/search.html
+++ b/themes/learn/layouts/partials/search.html
@@ -7,7 +7,7 @@
 <script type="text/javascript" src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
 <script type="text/javascript" src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
 <script type="text/javascript">
-    {{ if .Site.IsMultiLingual }}
+    {{ if hugo.IsMultilingual }}
         var baseurl = "{{.Site.BaseURL}}{{.Site.LanguagePrefix}}";
     {{ else }}
         var baseurl = "{{.Site.BaseURL}}";

From 8c7a58bc0f4ed3cd0f884deff4cb38164e37833a Mon Sep 17 00:00:00 2001
From: Ibrahim Cesar <email@ibrahimcesar.com>
Date: Thu, 13 Feb 2025 07:52:02 -0300
Subject: [PATCH 2/4] fix: disable search since is not working on prod after
 content-security changes

---
 config.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.toml b/config.toml
index 0c672f6e2..0b214cb85 100644
--- a/config.toml
+++ b/config.toml
@@ -14,6 +14,7 @@ theme = "learn"
 [params]
 themeVariant = "walabs"
 disableShortcutsTitle = true
+disableSearch = true
 
 # Order sections in menu by "weight" or "title". Default to "weight"
 ordersectionsby = "weight"

From f2ba9574cf17b54cd2a271219465d74f7783292f Mon Sep 17 00:00:00 2001
From: Ibrahim Cesar <ibracnb@amazon.com>
Date: Mon, 25 Aug 2025 15:38:54 -0300
Subject: [PATCH 3/4] clean: removing all code files inside this project. This
 is not a maintained code repo for reference

---
 .gitignore                                    |    5 +
 .../Serverless-Todo/src/api/template.yaml     |  283 ---
 .../Common/Code/Serverless-Todo/src/web.yaml  |   21 -
 .../Create_VPC_Stack/Code/vpc-alb-app-db.yaml | 2139 -----------------
 .../200_Cost_Category/Code/Project1cfm.yml    |  428 ----
 .../200_Cost_Category/Code/Project2cfm.yml    |  426 ----
 .../Code/sample_environment_template.yml      |  233 --
 .../Code/s3lifecycle-automation.yaml          |  141 --
 .../Code/crawler-cfn.yml                      |  298 ---
 .../Code/Management.yaml                      |  125 -
 .../Code/Optimization_Data_Collector.yaml     |  577 -----
 .../Code/account-collector.yaml               |  213 --
 .../Code/lambda_s3_athen_cf_template.yaml     |  206 --
 .../Code/module-budgets.yaml                  |  287 ---
 .../Code/module-compute-optimizer.yaml        |  546 -----
 .../module-cost-explorer-cost-anomaly.yaml    |  297 ---
 .../module-cost-explorer-rightsizing.yaml     |  522 ----
 .../Code/module-ecs-chargeback.yaml           |  308 ---
 .../Code/module-inventory.yaml                |  596 -----
 .../Code/module-organization.yaml             |  302 ---
 .../Code/module-pricing.yaml                  |  491 ----
 .../Code/module-rds-usage.yaml                |  741 ------
 .../Code/module-transit-gateway.yaml          |  438 ----
 .../Code/module-trusted-advisor.yaml          |  156 --
 .../Code/optimisation_read_only_role.yaml     |  304 ---
 .../Code/Management.yaml                      |   42 -
 .../Code/main.yaml                            |  302 ---
 .../Code/main_man.yaml                        |  277 ---
 .../Code/dependency_monitoring.yaml           |  303 ---
 .../Code/templates/automation_role.yml        |   38 -
 .../Code/templates/base_app.yml               |  568 -----
 .../Code/templates/base_resources.yml         |  261 --
 .../templates/playbook_gather_resources.yml   |  159 --
 .../playbook_investigate_application.yml      |   46 -
 ...book_investigate_application_resources.yml |  945 --------
 .../Code/templates/runbook_approval_gate.yml  |  102 -
 .../templates/runbook_scale_ecs_service.yml   |   48 -
 .../Code/cfn_health_aware_ssm_stack.yaml      |  451 ----
 .../Code/time_test.yaml                       |  295 ---
 .../Code/LinuxMachineDeploy.yaml              |  296 ---
 .../Code/WindowsMachineDeploy.yaml            |  569 -----
 .../Code/cfn/dr-data.yaml                     |  546 -----
 .../Code/cfn/dr-infra.yaml                    |  996 --------
 .../Code/cfn/workload.yaml                    | 1759 --------------
 .../Code/CloudFormation/s3_bucket.yaml        |  209 --
 .../Code/CloudFormation/simple_stack.yaml     |  285 ---
 .../CloudFormation/simple_stack_plus_s3.yaml  |  297 ---
 .../simple_stack_plus_s3_ec2.yaml             |  310 ---
 .../simple_stack_plus_s3_ec2_server.yaml      |  325 ---
 .../Code/backup-lab.yaml                      |  243 --
 .../Code/regular.yaml                         | 1033 --------
 .../Code/sharding.yaml                        | 1132 ---------
 .../Code/shuffle-sharding.yaml                | 1296 ----------
 .../staticwebapp-active-passive.yaml          |  590 -----
 .../Code/CloudFormation/staticwebapp.yaml     |  569 -----
 .../Code/BackupAndRestore.yaml                |  641 -----
 .../Code/BackupAndRestoreDB.yaml              |  180 --
 .../Disaster_Recovery/Code/HotStandby.yaml    | 1448 -----------
 .../Disaster_Recovery/Code/PilotLightDR.yaml  |  590 -----
 .../Disaster_Recovery/Code/WarmStandbyDR.yaml |  721 ------
 ...oudtrail-config-guardduty-securityhub.yaml |  629 -----
 .../Code/cloudtrail-config-guardduty.yaml     |  614 -----
 .../Code/staticwebapp.yaml                    |  411 ----
 .../Code/wordpress.yaml                       |  589 -----
 .../Code/baseline-iam.yaml                    |  539 -----
 .../Code/waf-global.yaml                      | 1023 --------
 .../Code/cloudformation-iam-user-cleanup.yaml |  174 --
 .../Code/waf-regional.yaml                    | 1023 --------
 .../Code/waf-global.yaml                      | 1023 --------
 .../code/security-lab-stack.yaml              |  294 ---
 .../Code/templates/section1/pattern1-base.yml |  267 --
 .../Code/templates/section2/pattern1-app.yml  |  345 ---
 .../templates/section3/pattern1-logging.yml   |  220 --
 .../section4_ssm_automation_document.yml      |   77 -
 .../Code/templates/section1/pattern3-base.yml |  257 --
 .../section2/pattern3-application.yml         |  296 ---
 .../templates/section3/pattern3-pipeline.yml  |  141 --
 .../templates/section4/pattern3-automate.yml  |   97 -
 ...fy-detect-sensitive-data-leakage-Macie.yml |  343 ---
 .../templates/section1/section1-base.yaml     |  578 -----
 .../section3/section3-enhance_security.yaml   |  353 ---
 .../code/vpc-flow-logs-custom.yaml            |  119 -
 .../code/vpc_athena_db_table_view_lambda.yaml |  567 -----
 ...c_athena_db_table_view_lambda_parquet.yaml |  619 -----
 ...owlogs_quicksight_multi_view_template.yaml |  403 ----
 .../vpc_flowlogs_quicksight_template.yaml     |  200 --
 .../amplify_api_template.yml                  |  187 --
 .../amplify_template.yml                      |  192 --
 .../artillery_load_test/test.yaml             |   18 -
 .../repo_template.yml                         |   14 -
 .../section1-oncall-health-sample-app.yaml    |   25 -
 .../Code/integration/template.yaml            |  152 --
 .../templates/section1/section1-base.yaml     |   25 -
 .../Code/risk_management.yaml                 |  110 -
 .../Code/CFN/DeployWACustomLambda.yaml        |  172 --
 .../Code/CFN/SampleLambdaAPIGWDeploy.yaml     |  281 ---
 96 files changed, 5 insertions(+), 40327 deletions(-)
 delete mode 100644 static/Common/Code/Serverless-Todo/src/api/template.yaml
 delete mode 100644 static/Common/Code/Serverless-Todo/src/web.yaml
 delete mode 100644 static/Common/Create_VPC_Stack/Code/vpc-alb-app-db.yaml
 delete mode 100644 static/Cost/200_Cost_Category/Code/Project1cfm.yml
 delete mode 100644 static/Cost/200_Cost_Category/Code/Project2cfm.yml
 delete mode 100644 static/Cost/200_EC2_Scheduling_at_Scale/Code/sample_environment_template.yml
 delete mode 100644 static/Cost/200_S3_Intelligent_Tiering/Code/s3lifecycle-automation.yaml
 delete mode 100644 static/Cost/300_Automated_CUR_Updates_and_Ingestion/Code/crawler-cfn.yml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/Management.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/Optimization_Data_Collector.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/account-collector.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/lambda_s3_athen_cf_template.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-budgets.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-compute-optimizer.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-cost-anomaly.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-rightsizing.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-ecs-chargeback.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-inventory.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-organization.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-pricing.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-rds-usage.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-transit-gateway.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/module-trusted-advisor.yaml
 delete mode 100644 static/Cost/300_Optimization_Data_Collection/Code/optimisation_read_only_role.yaml
 delete mode 100644 static/Cost/300_Organization_Data_CUR_Connection/Code/Management.yaml
 delete mode 100644 static/Cost/300_Organization_Data_CUR_Connection/Code/main.yaml
 delete mode 100644 static/Cost/300_Organization_Data_CUR_Connection/Code/main_man.yaml
 delete mode 100644 static/Operations/100_Dependency_Monitoring/Code/dependency_monitoring.yaml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/automation_role.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_resources.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_gather_resources.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application_resources.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_approval_gate.yml
 delete mode 100644 static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_scale_ecs_service.yml
 delete mode 100755 static/Operations/200_Build_AWS_Health_Aware_Operation_Change_Process/Code/cfn_health_aware_ssm_stack.yaml
 delete mode 100644 static/Performance/100_Clock_Source_Performance/Code/time_test.yaml
 delete mode 100644 static/Performance/100_Monitoring_Linux_EC2_CloudWatch/Code/LinuxMachineDeploy.yaml
 delete mode 100644 static/Performance/100_Monitoring_Windows_EC2_CloudWatch/Code/WindowsMachineDeploy.yaml
 delete mode 100644 static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-data.yaml
 delete mode 100644 static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-infra.yaml
 delete mode 100644 static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/workload.yaml
 delete mode 100644 static/Reliability/200_Bidirectional_Replication_for_S3/Code/CloudFormation/s3_bucket.yaml
 delete mode 100644 static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack.yaml
 delete mode 100644 static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3.yaml
 delete mode 100644 static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2.yaml
 delete mode 100644 static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2_server.yaml
 delete mode 100644 static/Reliability/200_Testing_Backup_and_Restore_of_Data/Code/backup-lab.yaml
 delete mode 100644 static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/regular.yaml
 delete mode 100644 static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/sharding.yaml
 delete mode 100644 static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/shuffle-sharding.yaml
 delete mode 100644 static/Reliability/Common/Code/CloudFormation/staticwebapp-active-passive.yaml
 delete mode 100644 static/Reliability/Common/Code/CloudFormation/staticwebapp.yaml
 delete mode 100644 static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml
 delete mode 100644 static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml
 delete mode 100644 static/Reliability/Disaster_Recovery/Code/HotStandby.yaml
 delete mode 100644 static/Reliability/Disaster_Recovery/Code/PilotLightDR.yaml
 delete mode 100644 static/Reliability/Disaster_Recovery/Code/WarmStandbyDR.yaml
 delete mode 100644 static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty-securityhub.yaml
 delete mode 100644 static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty.yaml
 delete mode 100644 static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/staticwebapp.yaml
 delete mode 100644 static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/wordpress.yaml
 delete mode 100644 static/Security/200_Automated_Deployment_of_IAM_Groups_and_Roles/Code/baseline-iam.yaml
 delete mode 100644 static/Security/200_Automated_Deployment_of_Web_Application_Firewall/Code/waf-global.yaml
 delete mode 100644 static/Security/200_Automated_IAM_User_Cleanup/Code/cloudformation-iam-user-cleanup.yaml
 delete mode 100644 static/Security/200_Basic_EC2_with_WAF_Protection/Code/waf-regional.yaml
 delete mode 100644 static/Security/200_CloudFront_with_WAF_Protection/Code/waf-global.yaml
 delete mode 100644 static/Security/200_Remote_Configuration_Installation_and_Viewing_CloudWatch_Logs/code/security-lab-stack.yaml
 delete mode 100644 static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section1/pattern1-base.yml
 delete mode 100644 static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section2/pattern1-app.yml
 delete mode 100644 static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section3/pattern1-logging.yml
 delete mode 100644 static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/scripts/section4_ssm_automation_document.yml
 delete mode 100644 static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section1/pattern3-base.yml
 delete mode 100644 static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section2/pattern3-application.yml
 delete mode 100644 static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section3/pattern3-pipeline.yml
 delete mode 100644 static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section4/pattern3-automate.yml
 delete mode 100644 static/Security/300_Identify_detect_and_notify_sensitive_data_leakage _using_Amazon_Macie/code/Identify-detect-sensitive-data-leakage-Macie.yml
 delete mode 100644 static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml
 delete mode 100644 static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section3/section3-enhance_security.yaml
 delete mode 100644 static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc-flow-logs-custom.yaml
 delete mode 100644 static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda.yaml
 delete mode 100644 static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda_parquet.yaml
 delete mode 100644 static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_multi_view_template.yaml
 delete mode 100644 static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_template.yaml
 delete mode 100644 static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_api_template.yml
 delete mode 100644 static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_template.yml
 delete mode 100644 static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/artillery_load_test/test.yaml
 delete mode 100644 static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/repo_template.yml
 delete mode 100644 static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/templates/section1/section1-oncall-health-sample-app.yaml
 delete mode 100644 static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/integration/template.yaml
 delete mode 100644 static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/templates/section1/section1-base.yaml
 delete mode 100644 static/watool/200_Manage_Workload_Risks_with_OpsCenter/Code/risk_management.yaml
 delete mode 100644 static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/DeployWACustomLambda.yaml
 delete mode 100644 static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/SampleLambdaAPIGWDeploy.yaml

diff --git a/.gitignore b/.gitignore
index 3bfee22af..67489a3f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,8 @@ dist/
 __pycache__
 .pytest_cache
 pytest.ini
+# Exclude yml and yaml files in Code directories
+**/Code/**/*.yml
+**/Code/**/*.yaml
+**/code/**/*.yml
+**/code/**/*.yaml
diff --git a/static/Common/Code/Serverless-Todo/src/api/template.yaml b/static/Common/Code/Serverless-Todo/src/api/template.yaml
deleted file mode 100644
index 7d0f6dbb1..000000000
--- a/static/Common/Code/Serverless-Todo/src/api/template.yaml
+++ /dev/null
@@ -1,283 +0,0 @@
-Transform: AWS::Serverless-2016-10-31
-Description: |
-  API for Todo MVC App
-
-Resources:
-  APIKey:
-    Type: AWS::KMS::Key
-    Properties:
-      PendingWindowInDays: 7
-      KeyPolicy:
-        Version: '2012-10-17'
-        Id: root
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS: !Sub 'arn:aws:iam::${AWS::AccountId}:root'
-            Action: 'kms:*'
-            Resource: '*'
-      Tags:
-        - Key: Name
-          Value: TodoApp
-
-  CreateQueue:
-    Type: AWS::SQS::Queue
-    Properties:
-      KmsMasterKeyId: !Ref APIKey
-      # Keep messages for 10 min
-      MessageRetentionPeriod: 600
-      VisibilityTimeout: 240
-      Tags:    
-        - Key: Name
-          Value: TodoApp
-
-  SendToSQSRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: [ apigateway.amazonaws.com ]
-            Action: [ sts:AssumeRole ]
-      Description: Allows API Gateway to send a message to SQS
-      Policies:
-        - PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Resource: !Sub "${CreateQueue.Arn}"
-                Action: [ sqs:SendMessage ]
-              - Effect: Allow
-                Resource: !Sub "${APIKey.Arn}"
-                Action: 
-                  - kms:GenerateDataKey
-                  - kms:Decrypt
-          PolicyName: SendToSQS
-      Tags:
-        - Key: Name
-          Value: TodoApp
-
-  Table:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      BillingMode: PAY_PER_REQUEST
-      KeySchema:
-        - AttributeName: todo_id
-          KeyType: HASH
-      AttributeDefinitions:
-        - AttributeName: todo_id
-          AttributeType: S
-      SSESpecification:
-        KMSMasterKeyId: !Ref APIKey
-        SSEEnabled: true
-        SSEType: KMS
-      Tags:
-        - Key: Name
-          Value: TodoApp
-
-  API:
-    Type: AWS::Serverless::Api
-    Properties:
-      Name: TodoApp
-      EndpointConfiguration: REGIONAL
-      StageName: Prod
-      Cors:
-        AllowOrigin: "'*'"
-        AllowHeaders:
-          "'Content-Type,Authorization,X-Amz-Date'"
-        MaxAge: "'600'"
-      DefinitionBody:
-        swagger: "2.0"
-        paths:
-          "/":
-            # post:
-            #   x-amazon-apigateway-integration:
-            #     uri: !Sub "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${CreateFunction.Arn}/invocations"
-            #     httpMethod: "POST"
-            #     type: "aws_proxy"
-            post:
-              consumes:
-              - "application/json"
-              produces:
-              - "application/json"
-              responses:
-                "200":
-                  description: "200 response"
-                  schema:
-                    $ref: "#/definitions/Empty"
-                  headers:
-                    Access-Control-Allow-Origin:
-                      type: "string"
-                    Access-Control-Allow-Methods:
-                      type: "string"
-                    Access-Control-Allow-Headers:
-                      type: "string"
-              x-amazon-apigateway-integration:
-                credentials: !Sub "${SendToSQSRole.Arn}"
-                uri: !Sub "arn:aws:apigateway:eu-west-1:sqs:path/${AWS::AccountId}/${CreateQueue.QueueName}"
-                responses:
-                  "200":
-                    statusCode: "200"
-                    responseParameters:
-                      method.response.header.Access-Control-Allow-Methods: "'*'"
-                      method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'"
-                      method.response.header.Access-Control-Allow-Origin: "'*'"
-                    responseTemplates:
-                      application/json: "{\"todo_id\": $input.json(\"$.SendMessageResponse.SendMessageResult.MessageId\")}"
-                requestParameters:
-                  integration.request.header.Content-Type: "'application/x-www-form-urlencoded'"
-                requestTemplates:
-                  application/json: "Action=SendMessage&MessageBody=$input.body"
-                passthroughBehavior: "never"
-                httpMethod: "POST"
-                type: "aws"
-            get:
-              x-amazon-apigateway-integration:
-                uri: !Sub "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ReadFunction.Arn}/invocations"
-                httpMethod: "POST"
-                type: "aws_proxy"
-          "/{id}":
-            delete:
-              parameters:
-                - name: id
-                  in: path
-                  required: true
-                  type: string
-              x-amazon-apigateway-integration:
-                uri: !Sub "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${DeleteFunction.Arn}/invocations"
-                httpMethod: "POST"
-                type: "aws_proxy"
-            post:
-              parameters:
-                - name: id
-                  in: path
-                  required: true
-                  type: string
-              x-amazon-apigateway-integration:
-                uri: !Sub "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${UpdateFunction.Arn}/invocations"
-                httpMethod: "POST"
-                type: "aws_proxy"
-        definitions:
-          Empty:
-            type: "object"
-            title: "Empty Schema"
-            
-  CreateFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: create
-      Handler: app.handler
-      MemorySize: 512
-      Runtime: python3.9
-      Tags:
-        Name: TodoApp
-      Timeout: 60
-      Tracing: Active
-      Policies:
-        - DynamoDBCrudPolicy:
-            TableName: !Ref Table
-        - KMSDecryptPolicy:
-            KeyId: !Ref APIKey
-      Events:
-        # API:
-        #   Type: Api
-        #   Properties:
-        #     Method: POST
-        #     Path: /
-        #     RestApiId: !Ref API
-        SQS:
-          Type: SQS
-          Properties:
-            Queue: !Sub "${CreateQueue.Arn}"
-      Environment:
-        Variables:
-          DDB_TABLE: !Ref Table
-
-  ReadFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: read
-      Handler: app.handler
-      MemorySize: 512
-      Runtime: python3.9
-      Tags:
-        Name: TodoApp
-      Timeout: 60
-      Tracing: Active
-      Policies:
-        - DynamoDBCrudPolicy:
-            TableName: !Ref Table
-        - KMSDecryptPolicy:
-            KeyId: !Ref APIKey
-      Events:
-        API:
-          Type: Api
-          Properties:
-            Method: GET
-            Path: /
-            RestApiId: !Ref API
-      Environment:
-        Variables:
-          DDB_TABLE: !Ref Table
-
-  DeleteFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: delete
-      Handler: app.handler
-      MemorySize: 512
-      Runtime: python3.9
-      Tags:
-        Name: TodoApp
-      Timeout: 60
-      Tracing: Active
-      Policies:
-        - DynamoDBCrudPolicy:
-            TableName: !Ref Table
-        - KMSDecryptPolicy:
-            KeyId: !Ref APIKey
-      Events:
-        API:
-          Type: Api
-          Properties:
-            Method: DELETE
-            Path: /{id}
-            RestApiId: !Ref API
-      Environment:
-        Variables:
-          DDB_TABLE: !Ref Table
-
-  UpdateFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: update
-      Handler: app.handler
-      MemorySize: 512
-      Runtime: python3.9
-      Tags:
-        Name: TodoApp
-      Timeout: 60
-      Tracing: Active
-      Policies:
-        - DynamoDBWritePolicy:
-            TableName: !Ref Table
-        - KMSDecryptPolicy:
-            KeyId: !Ref APIKey
-      Events:
-        API:
-          Type: Api
-          Properties:
-            Method: POST
-            Path: /{id}
-            RestApiId: !Ref API
-      Environment:
-        Variables:
-          DDB_TABLE: !Ref Table
-
-Outputs:
-  BaseUrl:
-    Value: !Sub "https://${API}.execute-api.${AWS::Region}.amazonaws.com/Prod"
-    Description: Base URL for the API Gateway
diff --git a/static/Common/Code/Serverless-Todo/src/web.yaml b/static/Common/Code/Serverless-Todo/src/web.yaml
deleted file mode 100644
index 84fdd1d4a..000000000
--- a/static/Common/Code/Serverless-Todo/src/web.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-Resources:
-  App:
-    Type: AWS::Amplify::App
-    Properties:
-      Name: todoApp
-      Tags:
-        - Key: Name
-          Value: TodoApp
-
-  Branch:
-    Type: AWS::Amplify::Branch
-    Properties:
-      AppId: !Sub "${App.AppId}"
-      BranchName: prod
-
-Outputs:
-  AppId:
-    Value: !Sub "${App.AppId}"
-
-  DefaultDomain:
-    Value: !Sub "https://prod.${App.DefaultDomain}"
\ No newline at end of file
diff --git a/static/Common/Create_VPC_Stack/Code/vpc-alb-app-db.yaml b/static/Common/Create_VPC_Stack/Code/vpc-alb-app-db.yaml
deleted file mode 100644
index 4ca41a1d6..000000000
--- a/static/Common/Create_VPC_Stack/Code/vpc-alb-app-db.yaml
+++ /dev/null
@@ -1,2139 +0,0 @@
----
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  This template is from: https://www.wellarchitectedlabs.com/
-  AWS CloudFormation Sample Template for VPC. Creates a multi-tier network appropriate for a web application 
-  including subnets for application, application load balancer (can disable), 
-  database (can disabled using parameter), and shared services (can disable).
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-  Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-      https://www.apache.org/licenses/LICENSE-2.0
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-Parameters:
-  #General:
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template, and exported values that can be referenced by other stacks.
-    Default: WebApp1
-  VPCIPv4CidrBlock:
-    Description: VPC CIDR block for IPv4. Default of 10.0.0.0/16 is recommended for testing.
-    Type: String
-    Default: 10.0.0.0/16
-  VPCSubnetIPv4Size:
-    Description: Host bit mask length of each subnet, e.g. default of 8 will be a /24 subnet size.
-    Type: Number
-    Default: 8
-  VPCNumberOfIPv4Subnets:
-    Description: Number of equally sized IPv4 subnets that will be created within the VPC CIDR block. Default of 256 is recommended for testing.
-    Type: Number
-    Default: 256
-  VPCSubnetIPv6Size:
-    Description: Host bit mask length of each subnet, e.g. default of 64 will be a /64 subnet size.
-    Type: Number
-    Default: 64
-  VPCNumberOfIPv6Subnets:
-    Description: Number of equally sized IPv6 subnets that will be created within the VPC CIDR block.
-    Type: Number
-    Default: 256
-  VPCFlowLogRetention:
-    Description: VPC Flow Log retention time in days. Note that VPC Flow Logs will be deleted when this stack is deleted.
-    Type: String
-    Default: 90
-  #ALB #1 Tier:
-  ALB1SubnetsEnabled:
-    Description: Create subnets and other resources for application load balancer (ALB) tier. False disables the ALB tier completely. 
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: true
-  #App #1 Tier:
-  App1SubnetsInternetRoute:
-    Description: Application subnets route to the internet through Nat Gateways (IPv4) or egress only internet gateway (IPv6). If set to true then shared tier also must be enabled. 
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: true
-  App1SubnetsPrivateLinkEndpoints:
-    Description: VPC Endpoints can be used to access example common AWS services privately within a subnet, instead of via a NAT Gateway. Note for testing purposes a NAT Gateway is more cost effective than enabling endpoint services.
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-  #DB #1 Tier:
-  DB1SubnetsEnabled:
-    Description: Create subnets and other resources for database (DB) tier. False disables the DB tier completely.
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: true
-  DB1TCPPortNumber:
-    Description: TCP/IP port number used in DB tier for Network ACL (NACL). Default is 3306 for MySQL. Examples; 5432 for PostgreSQL, 1433 for SQL Server, , 11211 for Memcache/Elasticache, 6379 for Redis.
-    Type: Number
-    Default: 3306
-  #Shared #1 Tier:
-  Shared1SubnetsEnabled:
-    Description: Create subnets for shared tier. Set to true when enabling application route to internet parameter as the shared tier contains NAT gateways that allow IPv4 traffic in the application tier to connect to the internet. False disables the shared tier completely.
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: true
-Conditions:
-  #ALB1:
-  ALB1Enabled: !Equals [!Ref ALB1SubnetsEnabled, "true"]
-  #App1:
-  App1SubnetsInternetRouteEnabled: !Equals [!Ref App1SubnetsInternetRoute, "true"]
-  App1SubnetsPrivateLinkEndpointsEnabled: !Equals [!Ref App1SubnetsPrivateLinkEndpoints, "true"]
-  #DB1:
-  DB1Enabled: !Equals [!Ref DB1SubnetsEnabled, "true"]
-  #Shared1:
-  Shared1Enabled:  !Equals [!Ref Shared1SubnetsEnabled, "true"]
-Resources:
-  #
-  #VPC
-  #
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
-      CidrBlock: !Ref VPCIPv4CidrBlock
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      InstanceTenancy: default
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - VPC
-  IPv6CidrBlock:
-    #IPv6 for VPC: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-cidr.html
-    Type: AWS::EC2::VPCCidrBlock
-    Properties:
-        AmazonProvidedIpv6CidrBlock: true
-        VpcId: !Ref VPC
-  VPCFlowLogGroup:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html
-    Type: "AWS::Logs::LogGroup"
-    DeletionPolicy: Delete
-    Properties:
-      #We omit LogGroupName so a unique one is generated
-      #LogGroupName:
-      RetentionInDays: !Ref VPCFlowLogRetention
-  VPCFlowLog:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html
-    Type: "AWS::EC2::FlowLog"
-    DependsOn: VPCFlowLogGroup
-    Properties:
-      DeliverLogsPermissionArn: !GetAtt VPCFlowLogRole.Arn
-      #LogDestination
-      LogDestinationType: cloud-watch-logs
-      LogGroupName: !Ref VPCFlowLogGroup
-      ResourceId: !Ref VPC
-      ResourceType: VPC
-      TrafficType: ALL
-  VPCFlowLogRole:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-VPCFlowLog-${AWS::Region}-${VPC}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - vpc-flow-logs.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      #PermissionsBoundary:
-      Policies:
-        - PolicyName: VPCFlowLog
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:DescribeLogGroups'
-                  - 'logs:DescribeLogStreams'
-                  - 'logs:PutLogEvents'
-                Resource: !Sub 'arn:${AWS::Partition}:logs:${AWS::Region}:${AWS::AccountId}:log-group:${AWS::StackName}-VPCFlowLogGroup-*'
-  IGW:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - IGW
-  IGWAttach:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      VpcId: !Ref VPC
-      InternetGatewayId: !Ref IGW
-      #VpnGatewayId
-  IGWEgressOnlyv6:
-    Type: AWS::EC2::EgressOnlyInternetGateway
-    Properties:
-      VpcId: !Ref VPC
-  InternetRoute:
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #DestinationIpv6CidrBlock: ::/0
-      #EgressOnlyInternetGatewayId
-      GatewayId: !Ref IGW
-      #InstanceId
-      #NatGatewayId
-      #NetworkInterfaceId
-      RouteTableId: !Ref InternetRouteTable
-      #VpcPeeringConnectionId
-  InternetRoutev6:
-    Type: AWS::EC2::Route
-    Properties:
-      DestinationIpv6CidrBlock: ::/0
-      RouteTableId: !Ref InternetRouteTable
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-  InternetRouteTable:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - RTB
-  #
-  #ALB1 Tier:
-  #
-  ALB1Subnet1:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true 
-      AvailabilityZone: !Select
-        - 0
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      CidrBlock: !Select [ 1, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 1, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-ALB1-a'
-      VpcId: !Ref VPC
-  ALB1Subnet2:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 1
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      CidrBlock: !Select [ 2, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 2, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-ALB1-b'
-      VpcId: !Ref VPC
-  ALB1Subnet3:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      #AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 2
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      CidrBlock: !Select [ 3, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 3, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-ALB1-c'
-      VpcId: !Ref VPC
-  ALB1Subnet1RouteToInternet:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - ALB1Subnet1
-      - InternetRouteTable
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref ALB1Subnet1
-  ALB1Subnet2RouteToInternet:
-    Condition: ALB1Enabled
-    DependsOn:
-      - ALB1Subnet2
-      - InternetRouteTable
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref ALB1Subnet2
-  ALB1Subnet3RouteToInternet:
-    Condition: ALB1Enabled
-    DependsOn:
-      - ALB1Subnet3
-      - InternetRouteTable
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref ALB1Subnet3
-  ALB1NetworkAcl1:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAcl'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-ALB1'
-  ALB1InFromInternetHTTPAclEntry:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '50'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: '0.0.0.0/0'
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1InFromInternetHTTPAclEntryv6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '56'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1InFromInternetHTTPSAclEntry:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: '0.0.0.0/0'
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1InFromInternetHTTPSAclEntryv6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1InNetworkEphemeralVPCAclEntry1:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1InNetworkEphemeralVPCAclEntry1v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1InNetworkEphemeralVPCAclEntry2:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1200'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1InNetworkEphemeralVPCAclEntry2v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1206'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1InNetworkEphemeralVPCAclEntry3:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1300'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1InNetworkEphemeralVPCAclEntry3v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1306'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1OutNetworkEphemeralAclEntry:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1000'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1OutNetworkEphemeralAclEntryv6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1006'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '1024'
-        To: '65535'
-  ALB1OutNetworkHTTPVPCAclEntry1:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1OutNetworkHTTPVPCAclEntry1v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1OutNetworkHTTPVPCAclEntry2:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1200'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1OutNetworkHTTPVPCAclEntry2v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1206'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1OutNetworkHTTPVPCAclEntry3:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1300'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1OutNetworkHTTPVPCAclEntry3v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '1306'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '80'
-        To: '80'
-  ALB1OutNetworkHTTPSVPCAclEntry1:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '2100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1OutNetworkHTTPSVPCAclEntry1v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '2106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1OutNetworkHTTPSVPCAclEntry2:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '2200'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1OutNetworkHTTPSVPCAclEntry2v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '2206'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1OutNetworkHTTPSVPCAclEntry3:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '2300'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1OutNetworkHTTPSVPCAclEntry3v6:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref ALB1NetworkAcl1
-      RuleNumber: '2306'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '443'
-        To: '443'
-  ALB1SubnetNetworkAclAssocation1:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref ALB1Subnet1
-      NetworkAclId: !Ref ALB1NetworkAcl1
-  ALB1SubnetNetworkAclAssocation2:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref ALB1Subnet2
-      NetworkAclId: !Ref ALB1NetworkAcl1
-  ALB1SubnetNetworkAclAssocation3:
-    Condition: ALB1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref ALB1Subnet3
-      NetworkAclId: !Ref ALB1NetworkAcl1
-  #
-  #App1 Tier:
-  #
-  App1Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true 
-      AvailabilityZone: !Select
-        - 0
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-App1-a'
-      VpcId: !Ref VPC
-  App1Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 1
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-App1-b'
-      VpcId: !Ref VPC
-  App1Subnet3:
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 2
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-App1-c'
-      VpcId: !Ref VPC
-  App1RouteTable1:
-    #To Do: Routes should be via a mechanism to filter traffic to prevent data exfiltration
-    Type: 'AWS::EC2::RouteTable'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-          - Key: Name
-            Value: !Join
-              - '-'
-              - - !Ref NamingPrefix
-                - App1
-                - RTB1
-  App1InternetRoute1:
-    Condition: App1SubnetsInternetRouteEnabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #EgressOnlyInternetGatewayId
-      #GatewayId:
-      #InstanceId
-      NatGatewayId: !Ref Shared1NATGW1
-      #NetworkInterfaceId
-      RouteTableId: !Ref App1RouteTable1
-      #VpcPeeringConnectionId
-  App1InternetRoute1v6:
-    Condition: App1SubnetsInternetRouteEnabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationIpv6CidrBlock: '::/0'
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-      RouteTableId: !Ref App1RouteTable1
-  App1RouteTable2:
-    #To Do: Routes should be via a mechanism to filter traffic to prevent data exfiltration
-    Type: 'AWS::EC2::RouteTable'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-          - Key: Name
-            Value: !Join
-              - '-'
-              - - !Ref NamingPrefix
-                - App1
-                - RTB2
-  App1InternetRoute2:
-    Condition: App1SubnetsInternetRouteEnabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #EgressOnlyInternetGatewayId
-      #GatewayId:
-      #InstanceId
-      NatGatewayId: !Ref Shared1NATGW2
-      #NetworkInterfaceId
-      RouteTableId: !Ref App1RouteTable2
-      #VpcPeeringConnectionId
-  App1InternetRoute2v6:
-    Condition: App1SubnetsInternetRouteEnabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationIpv6CidrBlock: '::/0'
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-      RouteTableId: !Ref App1RouteTable2
-  App1RouteTable3:
-    #To Do: Routes should be via a mechanism to filter traffic to prevent data exfiltration
-    Type: 'AWS::EC2::RouteTable'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-          - Key: Name
-            Value: !Join
-              - '-'
-              - - !Ref NamingPrefix
-                - App1
-                - RTB3
-  App1InternetRoute3:
-    Condition: App1SubnetsInternetRouteEnabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #EgressOnlyInternetGatewayId
-      #GatewayId:
-      #InstanceId
-      NatGatewayId: !Ref Shared1NATGW3
-      #NetworkInterfaceId
-      RouteTableId: !Ref App1RouteTable3
-      #VpcPeeringConnectionId
-  App1InternetRoute3v6:
-    Condition: App1SubnetsInternetRouteEnabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationIpv6CidrBlock: '::/0'
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-      RouteTableId: !Ref App1RouteTable3
-  App1SubnetRouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      SubnetId: !Ref App1Subnet1
-      RouteTableId: !Ref App1RouteTable1
-  App1SubnetRouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      SubnetId: !Ref App1Subnet2
-      RouteTableId: !Ref App1RouteTable2
-  App1SubnetRouteTableAssociation3:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      SubnetId: !Ref App1Subnet3
-      RouteTableId: !Ref App1RouteTable3
-  App1NetworkAcl1:
-    Type: 'AWS::EC2::NetworkAcl'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-App1'
-  App1InNetworkHTTPAclEntry:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '50'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Ref VPCIPv4CidrBlock
-      PortRange:
-        From: '80'
-        To: '80'
-  App1InNetworkHTTPAclEntryv6:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '56'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks ]
-      PortRange:
-        From: '80'
-        To: '80'
-  App1InNetworkHTTPSAclEntry:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Ref VPCIPv4CidrBlock
-      PortRange:
-        From: '443'
-        To: '443'
-  App1InNetworkHTTPSAclEntryv6:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks ]
-      PortRange:
-        From: '443'
-        To: '443'
-  App1InNetworkEphemeralAclEntry:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '150'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '1024'
-        To: '65535'
-  App1InNetworkEphemeralAclEntryv6:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '156'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '1024'
-        To: '65535'
-  App1OutNetworkHTTPAclEntry:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '80'
-        To: '80'
-  App1OutNetworkHTTPAclEntryv6:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '80'
-        To: '80'
-  App1OutNetworkHTTPSAclEntry:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '150'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '443'
-        To: '443'
-  App1OutNetworkHTTPSAclEntryv6:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '156'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '443'
-        To: '443'
-  App1OutNetworVPCAclEntry:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '200'
-      Protocol: '-1'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Ref VPCIPv4CidrBlock
-      PortRange:
-        From: '1'
-        To: '65535'
-  App1OutNetworVPCAclEntryv6:
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref App1NetworkAcl1
-      RuleNumber: '206'
-      Protocol: '-1'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks ]
-      PortRange:
-        From: '1'
-        To: '65535'
-  App1SubnetNetworkAclAssocation1:
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref App1Subnet1
-      NetworkAclId: !Ref App1NetworkAcl1
-  App1SubnetNetworkAclAssocation2:
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref App1Subnet2
-      NetworkAclId: !Ref App1NetworkAcl1
-  App1SubnetNetworkAclAssocation3:
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref App1Subnet3
-      NetworkAclId: !Ref App1NetworkAcl1
-  #
-  # App1 Endpoints
-  #
-  App1VPCEndpointS3:
-    Type: AWS::EC2::VPCEndpoint
-    Properties:
-      PolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          - Effect: Allow
-            Principal: '*'
-            Action: 's3:*'
-            Resource: !Sub 'arn:${AWS::Partition}:s3:::*'
-      RouteTableIds:
-        - !Ref App1RouteTable1
-        - !Ref App1RouteTable2
-        - !Ref App1RouteTable3
-      ServiceName: !Sub com.amazonaws.${AWS::Region}.s3
-      VpcId: !Ref VPC
-  App1VPCEndpointDynamoDB:
-    Type: AWS::EC2::VPCEndpoint
-    Properties:
-      PolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          - Effect: Allow
-            Principal: '*'
-            Action: 'dynamodb:*'
-            Resource: !Sub 'arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:*'
-      RouteTableIds:
-        - !Ref App1RouteTable1
-        - !Ref App1RouteTable2
-        - !Ref App1RouteTable3
-      ServiceName: !Sub com.amazonaws.${AWS::Region}.dynamodb
-      VpcId: !Ref VPC
-  App1EndpointSecurityGroup:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    DependsOn: App1Subnet3
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable access to endpoints
-      SecurityGroupIngress:
-        - 
-          IpProtocol: "tcp"
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-        - 
-          IpProtocol: "tcp"
-          FromPort: '443'
-          ToPort: '443'
-          CidrIpv6: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-        - 
-          IpProtocol: "tcp"
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-        - 
-          IpProtocol: "tcp"
-          FromPort: '443'
-          ToPort: '443'
-          CidrIpv6: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-        - 
-          IpProtocol: "tcp"
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-        - 
-          IpProtocol: "tcp"
-          FromPort: '443'
-          ToPort: '443'
-          CidrIpv6: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Endpoint
-      VpcId: !Ref VPC
-  App1VPCEndpointec2:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.ec2'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointec2messages:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.ec2messages'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointcloudformation:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.cloudformation'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointlogs:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.logs'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointmonitoring:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.monitoring'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointssm:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.ssm'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointssmmessages:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.ssmmessages'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointsecretsmanager:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.secretsmanager'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  App1VPCEndpointkms:
-    Condition: App1SubnetsPrivateLinkEndpointsEnabled
-    Type: AWS::EC2::VPCEndpoint
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-    Properties: 
-      VpcId: !Ref VPC
-      # RouteTableIds: 
-      #   - String
-      ServiceName: !Sub 'com.amazonaws.${AWS::Region}.kms'
-      # PolicyDocument: String
-      VpcEndpointType: Interface
-      PrivateDnsEnabled: true
-      SubnetIds: 
-        - !Ref App1Subnet1
-        - !Ref App1Subnet2
-        - !Ref App1Subnet3
-      SecurityGroupIds: 
-        - !Ref App1EndpointSecurityGroup
-  #
-  # Shared1 Tier:
-  #
-  Shared1Subnet1:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 0
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 21, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 21, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1-a'
-      VpcId: !Ref VPC
-  Shared1Subnet2:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 1
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 22, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 22, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1-b'
-      VpcId: !Ref VPC
-  Shared1Subnet3:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      AvailabilityZone: !Select
-        - 2
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 23, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 23, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1-c'
-      VpcId: !Ref VPC
-  Shared1NATGW1:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NatGateway
-    Properties: 
-      AllocationId:
-        Fn::GetAtt:
-          - Shared1NAT1EIP
-          - AllocationId
-      SubnetId:
-        Ref: Shared1Subnet1
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1-a'
-  Shared1NATGW2:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NatGateway
-    Properties: 
-      AllocationId:
-        Fn::GetAtt:
-          - Shared1NAT2EIP
-          - AllocationId
-      SubnetId:
-        Ref: Shared1Subnet2
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1-b'
-  Shared1NATGW3:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NatGateway
-    Properties: 
-      AllocationId:
-        Fn::GetAtt:
-          - Shared1NAT3EIP
-          - AllocationId
-      SubnetId:
-        Ref: Shared1Subnet3
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1-c'
-  Shared1NAT1EIP:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::EIP
-    Properties:
-      Domain: vpc
-  Shared1NAT2EIP:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::EIP
-    Properties:
-      Domain: vpc
-  Shared1NAT3EIP:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::EIP
-    Properties:
-      Domain: vpc
-  Shared1Route1:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #DestinationIpv6CidrBlock: ::/0
-      #EgressOnlyInternetGatewayId
-      GatewayId: !Ref IGW
-      #InstanceId
-      #NatGatewayId: !Ref Shared1NATGW1
-      #NetworkInterfaceId
-      RouteTableId: !Ref Shared1RouteTable1
-      #VpcPeeringConnectionId
-  Shared1Route1v6:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationIpv6CidrBlock: '::/0'
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-      RouteTableId: !Ref Shared1RouteTable1
-  Shared1RouteTable1:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Shared
-              - RTB1
-  Shared1SubnetRouteTableAssociation1:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - Shared1Subnet1
-      - Shared1RouteTable1
-    Properties:
-      RouteTableId: !Ref Shared1RouteTable1
-      SubnetId: !Ref Shared1Subnet1
-  Shared1Route2:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #DestinationIpv6CidrBlock: ::/0
-      #EgressOnlyInternetGatewayId
-      GatewayId: !Ref IGW
-      #InstanceId
-      #NatGatewayId: !Ref Shared1NATGW2
-      #NetworkInterfaceId
-      RouteTableId: !Ref Shared1RouteTable2
-      #VpcPeeringConnectionId
-  Shared1Route2v6:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationIpv6CidrBlock: '::/0'
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-      RouteTableId: !Ref Shared1RouteTable2
-  Shared1RouteTable2:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Shared
-              - RTB2
-  Shared1SubnetRouteTableAssociation2:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - Shared1Subnet2
-      - Shared1RouteTable2
-    Properties:
-      RouteTableId: !Ref Shared1RouteTable2
-      SubnetId: !Ref Shared1Subnet2
-  Shared1Route3:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      #DestinationIpv6CidrBlock: ::/0
-      #EgressOnlyInternetGatewayId
-      GatewayId: !Ref IGW
-      #InstanceId
-      #NatGatewayId: !Ref Shared1NATGW3
-      #NetworkInterfaceId
-      RouteTableId: !Ref Shared1RouteTable3
-      #VpcPeeringConnectionId
-  Shared1Route3v6:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::Route'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationIpv6CidrBlock: '::/0'
-      EgressOnlyInternetGatewayId: !Ref IGWEgressOnlyv6
-      RouteTableId: !Ref Shared1RouteTable3
-  Shared1RouteTable3:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Shared
-              - RTB3
-  Shared1SubnetRouteTableAssociation3:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - Shared1Subnet3
-      - Shared1RouteTable3
-    Properties:
-      RouteTableId: !Ref Shared1RouteTable3
-      SubnetId: !Ref Shared1Subnet3
-  Shared1NetworkAcl1:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAcl'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-Shared1'
-  Shared1InNetworkEphemeralAclEntry1:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '50'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '1024'
-        To: '65535'
-  Shared1InNetworkEphemeralAclEntry1v6:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '56'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '1024'
-        To: '65535'
-  Shared1InNetworkApp1Entry1:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '0'
-        To: '65535'
-  Shared1InNetworkApp1Entry1v6:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '0'
-        To: '65535'
-  Shared1InNetworkApp1Entry2:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '150'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '0'
-        To: '65535'
-  Shared1InNetworkApp1Entry2v6:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '156'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '0'
-        To: '65535'
-  Shared1InNetworkApp1Entry3:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '200'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '0'
-        To: '65535'
-  Shared1InNetworkApp1Entry3v6:
-    Condition: Shared1Enabled
-    Type: AWS::EC2::NetworkAclEntry
-    Properties:
-      NetworkAclId:
-        Ref: Shared1NetworkAcl1
-      RuleNumber: '206'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '0'
-        To: '65535'
-  Shared1OutNetworkEphemeralAclEntry:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref Shared1NetworkAcl1
-      RuleNumber: '50'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '1024'
-        To: '65535'
-  Shared1OutNetworkEphemeralAclEntryv6:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref Shared1NetworkAcl1
-      RuleNumber: '56'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '1024'
-        To: '65535'
-  Shared1OutNetworkHTTPAclEntry:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref Shared1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '80'
-        To: '80'
-  Shared1OutNetworkHTTPAclEntryv6:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref Shared1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '80'
-        To: '80'
-  Shared1OutNetworkHTTPSAclEntry:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref Shared1NetworkAcl1
-      RuleNumber: '200'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: 0.0.0.0/0
-      PortRange:
-        From: '443'
-        To: '443'
-  Shared1OutNetworkHTTPSAclEntryv6:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref Shared1NetworkAcl1
-      RuleNumber: '206'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: '::/0'
-      PortRange:
-        From: '443'
-        To: '443'
-  Shared1Subnet1NetworkAclAssocation1:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref Shared1Subnet1
-      NetworkAclId: !Ref Shared1NetworkAcl1
-  Shared1Subnet1NetworkAclAssocation2:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref Shared1Subnet2
-      NetworkAclId: !Ref Shared1NetworkAcl1
-  Shared1Subnet1NetworkAclAssocation3:
-    Condition: Shared1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref Shared1Subnet3
-      NetworkAclId: !Ref Shared1NetworkAcl1
-  #
-  #DB1 Tier:
-  #
-  DB1Subnet1:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 0
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 31, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 31, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-DB1-a'
-  DB1Subnet2:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 1
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 32, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 32, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-DB1-b'
-  DB1Subnet3:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::Subnet'
-    DependsOn: IPv6CidrBlock
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      AssignIpv6AddressOnCreation: true
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 2
-        - Fn::GetAZs: !Ref 'AWS::Region'
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-      CidrBlock: !Select [ 33, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      Ipv6CidrBlock: !Select [ 33, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-DB1-c'
-  DB1RouteTable1:
-    Condition: DB1Enabled
-    #To Do: Routes should be via a mechanism to filter traffic to prevent data exfiltration
-    Type: 'AWS::EC2::RouteTable'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-          - Key: Name
-            Value: !Join
-              - '-'
-              - - !Ref NamingPrefix
-                - DB1
-                - RTB1
-  DB1RouteTable2:
-    Condition: DB1Enabled
-    #To Do: Routes should be via a mechanism to filter traffic to prevent data exfiltration
-    Type: 'AWS::EC2::RouteTable'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-          - Key: Name
-            Value: !Join
-              - '-'
-              - - !Ref NamingPrefix
-                - DB1
-                - RTB2
-  DB1RouteTable3:
-    Condition: DB1Enabled
-    #To Do: Routes should be via a mechanism to filter traffic to prevent data exfiltration
-    Type: 'AWS::EC2::RouteTable'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-          - Key: Name
-            Value: !Join
-              - '-'
-              - - !Ref NamingPrefix
-                - DB1
-                - RTB3
-  DB1SubnetRouteTableAssociation1:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      SubnetId: !Ref DB1Subnet1
-      RouteTableId: !Ref DB1RouteTable1
-  DB1SubnetRouteTableAssociation2:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      SubnetId: !Ref DB1Subnet2
-      RouteTableId: !Ref DB1RouteTable2
-  DB1SubnetRouteTableAssociation3:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    Properties:
-      SubnetId: !Ref DB1Subnet3
-      RouteTableId: !Ref DB1RouteTable3
-  DB1NetworkAcl1:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAcl'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}-DB1'
-  DB1InFromApp1AclEntry1:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '50'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: !Ref DB1TCPPortNumber
-        To: !Ref DB1TCPPortNumber
-  DB1InFromApp1AclEntry1v6:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '56'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: !Ref DB1TCPPortNumber
-        To: !Ref DB1TCPPortNumber
-  DB1InFromApp1AclEntry2:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: !Ref DB1TCPPortNumber
-        To: !Ref DB1TCPPortNumber
-  DB1InFromApp1AclEntry2v6:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: !Ref DB1TCPPortNumber
-        To: !Ref DB1TCPPortNumber
-  DB1InFromApp1AclEntry3:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '150'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: !Ref DB1TCPPortNumber
-        To: !Ref DB1TCPPortNumber
-  DB1InFromApp1AclEntry3v6:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '156'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'false'
-      Ipv6CidrBlock: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: !Ref DB1TCPPortNumber
-        To: !Ref DB1TCPPortNumber
-  DB1OutNetworkEphemeralAclEntry1:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '50'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 11, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  DB1OutNetworkEphemeralAclEntry1v6:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '56'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 11, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  DB1OutNetworkEphemeralAclEntry2:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '100'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 12, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  DB1OutNetworkEphemeralAclEntry2v6:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '106'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 12, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  DB1OutNetworkEphemeralAclEntry3:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '150'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      CidrBlock: !Select [ 13, Fn::Cidr: [ !GetAtt VPC.CidrBlock, !Ref VPCNumberOfIPv4Subnets, !Ref VPCSubnetIPv4Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  DB1OutNetworkEphemeralAclEntry3v6:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::NetworkAclEntry'
-    Properties:
-      NetworkAclId: !Ref DB1NetworkAcl1
-      RuleNumber: '156'
-      Protocol: '6'
-      RuleAction: allow
-      Egress: 'true'
-      Ipv6CidrBlock: !Select [ 13, Fn::Cidr: [ !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks], !Ref VPCNumberOfIPv6Subnets, !Ref VPCSubnetIPv6Size ]]
-      PortRange:
-        From: '1024'
-        To: '65535'
-  DB1SubnetNetworkAclAssocation1:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref DB1Subnet1
-      NetworkAclId: !Ref DB1NetworkAcl1
-  DB1SubnetNetworkAclAssocation2:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref DB1Subnet2
-      NetworkAclId: !Ref DB1NetworkAcl1
-  DB1SubnetNetworkAclAssocation3:
-    Condition: DB1Enabled
-    Type: 'AWS::EC2::SubnetNetworkAclAssociation'
-    Properties:
-      SubnetId: !Ref DB1Subnet3
-      NetworkAclId: !Ref DB1NetworkAcl1
-
-
-Outputs:
-  AppVPC:
-    Description: VPC
-    Value: !Ref VPC
-    Export:
-      Name: !Sub '${AWS::StackName}'
-  AppVPCIPv4CIDR:
-    Description: VPC CIDR for IPv4
-    Value: !GetAtt VPC.CidrBlock
-    Export:
-      Name: !Sub '${AWS::StackName}-VPCIPv4CIDR'
-  AppVPCIPv6CIDR:
-    Description: VPC CIDR for IPv6
-    Value: !Select [ 0, !GetAtt VPC.Ipv6CidrBlocks ]
-    Export:
-      Name: !Sub '${AWS::StackName}-VPCIPv6CIDR'
-  AppVPCFlowLogsArn:
-    Description: ARN of VPC Flow Logs Group
-    Value: !GetAtt VPCFlowLogGroup.Arn
-    Export:
-      Name: !Sub '${AWS::StackName}-VPCFlowLogsArn'
-  #ALB1:
-  ALB1Subnet1:
-    Condition: ALB1Enabled
-    Description: ALB1Subnet1
-    Value: !Ref ALB1Subnet1
-    Export:
-      Name: !Sub '${AWS::StackName}-ALB1Subnet1'
-  ALB1Subnet2:
-    Condition: ALB1Enabled
-    Description: ALB1Subnet2
-    Value: !Ref ALB1Subnet2
-    Export:
-      Name: !Sub '${AWS::StackName}-ALB1Subnet2'
-  ALB1Subnet3:
-    Condition: ALB1Enabled
-    Description: ALB1Subnet3
-    Value: !Ref ALB1Subnet3
-    Export:
-      Name: !Sub '${AWS::StackName}-ALB1Subnet3'
-  #App1:
-  App1Subnet1:
-    Description: App1Subnet1
-    Value: !Ref App1Subnet1
-    Export:
-      Name: !Sub '${AWS::StackName}-App1Subnet1'
-  App1Subnet2:
-    Description: App1Subnet2
-    Value: !Ref App1Subnet2
-    Export:
-      Name: !Sub '${AWS::StackName}-App1Subnet2'
-  App1Subnet3:
-    Description: App1Subnet3
-    Value: !Ref App1Subnet3
-    Export:
-      Name: !Sub '${AWS::StackName}-App1Subnet3'
-  #DB1:
-  DB1Subnet1:
-    Condition: DB1Enabled
-    Description: DB1Subnet1
-    Value: !Ref DB1Subnet1
-    Export:
-      Name: !Sub '${AWS::StackName}-DB1Subnet1'
-  DB1Subnet2:
-    Condition: DB1Enabled
-    Description: DB1Subnet2
-    Value: !Ref DB1Subnet2
-    Export:
-      Name: !Sub '${AWS::StackName}-DB1Subnet2'
-  DB1Subnet3:
-    Condition: DB1Enabled
-    Description: DB1Subnet3
-    Value: !Ref DB1Subnet3
-    Export:
-      Name: !Sub '${AWS::StackName}-DB1Subnet3'
-  #Shared1:
-  Shared1Subnet1:
-    Condition: Shared1Enabled
-    Description: Shared1Subnet1
-    Value: !Ref Shared1Subnet1
-    Export:
-      Name: !Sub '${AWS::StackName}-Shared1Subnet1'
-  Shared1Subnet2:
-    Condition: Shared1Enabled
-    Description: Shared1Subnet2
-    Value: !Ref Shared1Subnet2
-    Export:
-      Name: !Sub '${AWS::StackName}-Shared1Subnet2'
-  Shared1Subnet3:
-    Condition: Shared1Enabled
-    Description: Shared1Subnet3
-    Value: !Ref Shared1Subnet3
-    Export:
-      Name: !Sub '${AWS::StackName}-Shared1Subnet3'
-Metadata:
-  AWS::CloudFormation::Interface: 
-    ParameterGroups: 
-      - 
-        Label: 
-          default: "General Configuration"
-        Parameters:
-          - NamingPrefix
-          - VPCIPv4CidrBlock
-          - VPCSubnetIPv4Size
-          - VPCNumberOfIPv4Subnets
-          - VPCSubnetIPv6Size
-          - VPCNumberOfIPv6Subnets
-          - VPCFlowLogRetention
-      - 
-        Label: 
-          default: "Application Load Balancer Tier"
-        Parameters: 
-          - ALB1SubnetsEnabled
-      - 
-        Label: 
-          default: "Application Tier"
-        Parameters: 
-          - App1SubnetsInternetRoute
-          - App1SubnetsPrivateLinkEndpoints
-      - 
-        Label: 
-          default: "Database Tier"
-        Parameters: 
-          - DB1SubnetsEnabled
-          - DB1TCPPortNumber
-      - 
-        Label: 
-          default: "Shared Tier"
-        Parameters: 
-          - Shared1SubnetsEnabled
-    ParameterLabels:
-      NamingPrefix:
-        default: Naming Prefix
-      VPCIPv4CidrBlock:
-        default: VPC IPv4 CIDR block
-      VPCSubnetIPv4Size:
-        default: Size of each IPv4 subnet in the VPC
-      VPCNumberOfIPv4Subnets:
-        default: Number of IPv4 subnets in VPC
-      VPCSubnetIPv6Size:
-        default: Size of each IPv6 subnet in the VPC
-      VPCNumberOfIPv6Subnets:
-        default: Number of IPv6 subnets in VPC
-      VPCFlowLogRetention:
-        default: Days to retain VPC Flow Logs
-      ALB1SubnetsEnabled:
-        default: Application Load Balancer tier
-      App1SubnetsInternetRoute:
-        default: Application tier route to internet
-      App1SubnetsPrivateLinkEndpoints:
-        default: Private Link Endpoints
-      DB1SubnetsEnabled:
-        default: Database tier
-      DB1TCPPortNumber:
-        default: TCP port number used by database
-      Shared1SubnetsEnabled:
-        default: Shared tier
-
diff --git a/static/Cost/200_Cost_Category/Code/Project1cfm.yml b/static/Cost/200_Cost_Category/Code/Project1cfm.yml
deleted file mode 100644
index 2c7624566..000000000
--- a/static/Cost/200_Cost_Category/Code/Project1cfm.yml
+++ /dev/null
@@ -1,428 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description:
-  This template deploys a VPC, with a pair of public and private subnets spread
-  across two Availability Zones. It deploys an internet gateway, with a default
-  route on the public subnets. It deploys a pair of NAT gateways (one in each AZ),
-  and default routes for them in the private subnets.
-
-Parameters:
-  VpcCIDR:
-    Description: Please enter the IP range (CIDR notation) for this VPC
-    Type: String
-    Default: 10.0.0.0/16
-
-  LatestAmiId:
-    Description: Region specific image from the Parameter Store
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  
-  InstanceType:
-    Description: Amazon EC2 instance type for the instances
-    Type: String
-    AllowedValues:
-      - t2.micro
-    Default: t2.micro  
-
-  PublicSubnet1CIDR:
-    Description: Please enter the IP range (CIDR notation) for the public subnet in the first Availability Zone
-    Type: String
-    Default: 10.0.0.0/20
-
-  PublicSubnet2CIDR:
-    Description: Please enter the IP range (CIDR notation) for the public subnet in the second Availability Zone
-    Type: String
-    Default: 10.0.16.0/20
-
-  PrivateSubnet1CIDR:
-    Description: Please enter the IP range (CIDR notation) for the first private subnet in the first Availability Zone
-    Type: String
-    Default: 10.0.128.0/20
-
-  PrivateSubnet2CIDR:
-    Description: Please enter the IP range (CIDR notation) for the second private subnet in the second Availability Zone
-    Type: String
-    Default: 10.0.144.0/20
-
-
-Resources:
-  VPC:
-    Type: AWS::EC2::VPC
-    Properties:
-      CidrBlock: !Ref VpcCIDR
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      Tags:
-      - Key: Name
-        Value: Project1VPC
-      - Key: Department
-        Value: Digital
-
-  InternetGateway:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-      - Key: Name
-        Value: Project1IGW
-      - Key: Department
-        Value: Digital
-
-  InternetGatewayAttachment:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-
-  Project1PublicSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicSubnet1CIDR
-      MapPublicIpOnLaunch: true
-
-  Project1PublicSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicSubnet2CIDR
-      MapPublicIpOnLaunch: true
-
-  Project1PrivateSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PrivateSubnet1CIDR
-      MapPublicIpOnLaunch: false
-
-  Project1PrivateSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PrivateSubnet2CIDR
-      MapPublicIpOnLaunch: false
-
-  Project1NatGatewayEIP:
-    Type: AWS::EC2::EIP
-    DependsOn: InternetGatewayAttachment
-    Properties:
-      Domain: vpc
-
-  Project1NatGateway:
-    Type: AWS::EC2::NatGateway
-    Properties:
-      AllocationId: !GetAtt Project1NatGatewayEIP.AllocationId
-      SubnetId: !Ref Project1PublicSubnet1
-      Tags:
-      - Key: Name
-        Value: Project1NatGateway
-      - Key: Department
-        Value: Digital
-
-  #Public Route Table
-  PublicRouteTable:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-
-  DefaultPublicRoute:
-    Type: AWS::EC2::Route
-    DependsOn: InternetGatewayAttachment
-    Properties:
-      RouteTableId: !Ref PublicRouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-
-  Project1PublicSubnet1RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PublicRouteTable
-      SubnetId: !Ref Project1PublicSubnet1
-
-  Project1PublicSubnet2RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PublicRouteTable
-      SubnetId: !Ref Project1PublicSubnet2
-
-  #AZ1 Route Table
-  PrivateRouteTable1:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-
-  DefaultPrivateRoute1:
-    Type: AWS::EC2::Route
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Project1NatGateway
-
-  PrivateSubnet1RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable1
-      SubnetId: !Ref Project1PrivateSubnet1
-
-  #AZ2 Route Table
-  PrivateRouteTable2:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-
-  DefaultPrivateRoute2:
-    Type: AWS::EC2::Route
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Project1NatGateway
-
-  Project1PrivateSubnet2RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable2
-      SubnetId: !Ref Project1PrivateSubnet2
-  
-  #SecurityGroups, make sure your Egress rule are correct or it will not talk to back end.
-  #You can lock your inbound on the Project1webapp to just your IP if you so choose to be more secure
-  ApplicationLoadBalancerSG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: http traffic to web tier
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0
-            
-  WebProject1SG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: Allow http to client host
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 22
-          ToPort: 22
-          CidrIp: 0.0.0.0/0 
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0
-
-  WebAppSG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: Load Balancer to WebTier
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          SourceSecurityGroupId: !Ref ApplicationLoadBalancerSG 
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0  
-
-  DatabaseSG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: web to database tier
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref WebProject1SG
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0 
-
-#Web tier infrastructure, This will be an ASG, Launchconfig, some autoscaling alarms and scaling polices. 
-  InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: taginstancepolicy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'ec2:Describe*'
-                Resource: '*'
-              - Effect: Allow
-                Action:
-                  - 'ec2:CreateTags'
-                Resource:
-                  - !Sub 'arn:aws:ec2:${AWS::Region}:${AWS::AccountId}:volume/*'
-                  - !Sub 'arn:aws:ec2:${AWS::Region}:${AWS::AccountId}:instance/*'
-  InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref InstanceRole
-
-  myASG:
-    Type: AWS::AutoScaling::AutoScalingGroup
-    Properties:      
-      LaunchConfigurationName: !Ref myLaunchConfig
-      MaxSize: '2'
-      MinSize: '1'
-      DesiredCapacity: '1'
-      VPCZoneIdentifier:   
-        - !Ref Project1PublicSubnet1
-        - !Ref Project1PublicSubnet2
-      MetricsCollection: 
-        - Granularity: 1Minute
-          Metrics: 
-            - GroupMinSize
-            - GroupMaxSize
-      TargetGroupARNs: 
-       - Ref: WebTierALBTargetGroup 
-      Tags:
-      - Key: Name
-        PropagateAtLaunch: true
-        Value: Project1webapp
-      - Key: Department
-        PropagateAtLaunch: true
-        Value: Digital
-           
-  myLaunchConfig: 
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Properties:
-      ImageId: !Ref LatestAmiId
-      SecurityGroups: 
-        - !GetAtt WebAppSG.GroupId
-      InstanceType: 
-        !Ref InstanceType  
-      IamInstanceProfile: !Ref InstanceProfile
-      UserData:
-         Fn::Base64: |
-            #!/bin/bash
-            AWS_AVAIL_ZONE=$(curl http://169.254.169.254/latest/meta-data/placement/availability-zone)
-            AWS_REGION=${AWS_AVAIL_ZONE::-1}
-            AWS_INSTANCE_ID=$(curl http://169.254.169.254/latest/meta-data/instance-id)
-            ROOT_VOLUME_IDS=$(aws ec2 describe-instances --region $AWS_REGION --instance-id $AWS_INSTANCE_ID --output text --query Reservations[0].Instances[0].BlockDeviceMappings[0].Ebs.VolumeId)
-            aws ec2 create-tags --resources $ROOT_VOLUME_IDS --region $AWS_REGION --tags Key=Name,Value=Project1Volume Key=Department,Value=Digital
-            yum update -y
-            yum install -y httpd
-            systemctl start httpd
-            systemctl enable httpd
-            echo '<h1>Hello World</h1>' > /var/www/html/index.html
-
-  WebTierLoadBalancer:
-    Type: "AWS::ElasticLoadBalancingV2::LoadBalancer"
-    Properties:
-      Name: Project1WebTierLoadBalancer
-      Subnets: 
-       - !Ref Project1PublicSubnet1
-       - !Ref Project1PublicSubnet2
-      SecurityGroups: 
-        - !GetAtt ApplicationLoadBalancerSG.GroupId 
-      Tags:
-      - Key: Name
-        Value: Project1WebTierLoadBalancer
-      - Key: Department
-        Value: Digital
-  WebTierListener:
-    Type: "AWS::ElasticLoadBalancingV2::Listener"
-    Properties:
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref WebTierALBTargetGroup
-      LoadBalancerArn: !Ref WebTierLoadBalancer
-      Port: "80"
-      Protocol: HTTP
-  WebTierALBTargetGroup:
-    Type: "AWS::ElasticLoadBalancingV2::TargetGroup"
-    Properties:
-      HealthCheckIntervalSeconds: 30
-      HealthCheckTimeoutSeconds: 5
-      HealthyThresholdCount: 2
-      Port: 80
-      Protocol: HTTP
-      UnhealthyThresholdCount: 5
-      VpcId: !Ref VPC
-
-  Database:
-    Type: AWS::RDS::DBInstance
-    Properties:
-      VPCSecurityGroups: 
-       - !GetAtt DatabaseSG.GroupId
-      AllocatedStorage: '20'
-      PubliclyAccessible: 'false'
-      DBInstanceClass: db.t3.micro
-      Engine: MySQL
-      DBInstanceIdentifier: Project1Database
-      MasterUsername: MyName
-      MasterUserPassword: MyPassword
-      DBSubnetGroupName: !Ref DatabaseSubnetGroup
-      AutoMinorVersionUpgrade: false
-      BackupRetentionPeriod: '0'
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-      - Key: Name
-        Value: Project1Database
-      - Key: Department
-        Value: Digital
-      
-
-#must have this or your VPC isnt a VPC Database, this allows the DB to know which instances to be in
-  DatabaseSubnetGroup:
-    Type: AWS::RDS::DBSubnetGroup
-    Properties:
-      DBSubnetGroupDescription: subnet group
-      SubnetIds: 
-       - !Ref Project1PublicSubnet1
-       - !Ref Project1PublicSubnet2
-       - !Ref Project1PrivateSubnet1
-       - !Ref Project1PrivateSubnet2
-       
\ No newline at end of file
diff --git a/static/Cost/200_Cost_Category/Code/Project2cfm.yml b/static/Cost/200_Cost_Category/Code/Project2cfm.yml
deleted file mode 100644
index e9d13bdf3..000000000
--- a/static/Cost/200_Cost_Category/Code/Project2cfm.yml
+++ /dev/null
@@ -1,426 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description:
-  This template deploys a VPC, with a pair of public and private subnets spread
-  across two Availability Zones. It deploys an internet gateway, with a default
-  route on the public subnets. It deploys a pair of NAT gateways (one in each AZ),
-  and default routes for them in the private subnets.
-
-Parameters:
-  VpcCIDR:
-    Description: Please enter the IP range (CIDR notation) for this VPC
-    Type: String
-    Default: 10.1.0.0/16
-
-  LatestAmiId:
-    Description: Region specific image from the Parameter Store
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  InstanceType:
-    Description: Amazon EC2 instance type for the instances
-    Type: String
-    AllowedValues:
-      - t2.micro
-    Default: t2.micro  
-
-  PublicSubnet1CIDR:
-    Description: Please enter the IP range (CIDR notation) for the public subnet in the first Availability Zone
-    Type: String
-    Default: 10.1.0.0/20
-
-  PublicSubnet2CIDR:
-    Description: Please enter the IP range (CIDR notation) for the public subnet in the second Availability Zone
-    Type: String
-    Default: 10.1.16.0/20
-
-  PrivateSubnet1CIDR:
-    Description: Please enter the IP range (CIDR notation) for the first private subnet in the first Availability Zone
-    Type: String
-    Default: 10.1.128.0/20
-
-  PrivateSubnet2CIDR:
-    Description: Please enter the IP range (CIDR notation) for the second private subnet in the second Availability Zone
-    Type: String
-    Default: 10.1.144.0/20
-
-Resources:
-  VPC:
-    Type: AWS::EC2::VPC
-    Properties:
-      CidrBlock: !Ref VpcCIDR
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      Tags:
-      - Key: Name
-        Value: Project2vpc
-      - Key: Department
-        Value: Digital
-
-  InternetGateway:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-      - Key: Name
-        Value: Project2IGW
-      - Key: Department
-        Value: Digital
-
-
-  InternetGatewayAttachment:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-
-  Project2PublicSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicSubnet1CIDR
-      MapPublicIpOnLaunch: true
-
-  Project2PublicSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicSubnet2CIDR
-      MapPublicIpOnLaunch: true
-
-  Project2PrivateSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PrivateSubnet1CIDR
-      MapPublicIpOnLaunch: false
-
-  Project2PrivateSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PrivateSubnet2CIDR
-      MapPublicIpOnLaunch: false
-
-  Project2NatGatewayEIP:
-    Type: AWS::EC2::EIP
-    DependsOn: InternetGatewayAttachment
-    Properties:
-      Domain: vpc
-
-  Project2NatGateway:
-    Type: AWS::EC2::NatGateway
-    Properties:
-      AllocationId: !GetAtt Project2NatGatewayEIP.AllocationId
-      SubnetId: !Ref Project2PublicSubnet1
-      Tags:
-      - Key: Name
-        Value: Project2NatGateway
-      - Key: Department
-        Value: Digital
-
-
-  #Public Route Table
-  PublicRouteTable:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-
-  DefaultPublicRoute:
-    Type: AWS::EC2::Route
-    DependsOn: InternetGatewayAttachment
-    Properties:
-      RouteTableId: !Ref PublicRouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-
-  Project2PublicSubnet1RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PublicRouteTable
-      SubnetId: !Ref Project2PublicSubnet1
-
-  Project2PublicSubnet2RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PublicRouteTable
-      SubnetId: !Ref Project2PublicSubnet2
-
-  #AZ1 Route Table
-  PrivateRouteTable1:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-
-  DefaultPrivateRoute1:
-    Type: AWS::EC2::Route
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Project2NatGateway
-
-  PrivateSubnet1RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable1
-      SubnetId: !Ref Project2PrivateSubnet1
-
-  #AZ2 Route Table
-  PrivateRouteTable2:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-
-  DefaultPrivateRoute2:
-    Type: AWS::EC2::Route
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Project2NatGateway
-
-  Project2PrivateSubnet2RouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable2
-      SubnetId: !Ref Project2PrivateSubnet2
-  
-  #SecurityGroups, make sure your Egress rule are correct or it will not talk to back end.
-  #You can lock your inbound on the Project2webapp to just your IP if you so choose to be more secure
-  ApplicationLoadBalancerSG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: http traffic to web tier
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0
-            
-  WebProject2SG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: Allow http to client host
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 22
-          ToPort: 22
-          CidrIp: 0.0.0.0/0 
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0
-
-  WebAppSG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: Load Balancer to WebTier
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          SourceSecurityGroupId: !Ref ApplicationLoadBalancerSG 
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0  
-
-  DatabaseSG:
-    Type: AWS::EC2::SecurityGroup
-    DependsOn: VPC
-    Properties:
-      GroupDescription: web to database tier
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref WebProject2SG
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 0
-          ToPort: 65535
-          CidrIp: 0.0.0.0/0 
-
-  #Web tier infrastructure, This will be an ASG, Launchconfig, some autoscaling alarms and scaling polices. 
-  InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: taginstancepolicy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'ec2:Describe*'
-                Resource: '*'
-              - Effect: Allow
-                Action:
-                  - 'ec2:CreateTags'
-                Resource:
-                  - !Sub 'arn:aws:ec2:${AWS::Region}:${AWS::AccountId}:volume/*'
-                  - !Sub 'arn:aws:ec2:${AWS::Region}:${AWS::AccountId}:instance/*'
-  InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref InstanceRole
-
-#Web tier infrascture, This will be an ASG, Launchconfig, some autoscaling alarms and scaling polices. 
-  myASG:
-    Type: AWS::AutoScaling::AutoScalingGroup
-    Properties:      
-      LaunchConfigurationName: !Ref myLaunchConfig
-      MaxSize: '2'
-      MinSize: '1'
-      DesiredCapacity: '1'
-      VPCZoneIdentifier:   
-        - !Ref Project2PublicSubnet1
-        - !Ref Project2PublicSubnet2
-      MetricsCollection: 
-        - Granularity: 1Minute
-          Metrics: 
-            - GroupMinSize
-            - GroupMaxSize
-      TargetGroupARNs: 
-       - Ref: WebTierALBTargetGroup  
-      Tags:
-      - Key: Name
-        PropagateAtLaunch: true
-        Value: Project2webapp 
-      - Key: Department
-        PropagateAtLaunch: true
-        Value: Digital           
-  myLaunchConfig: 
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Properties:
-      ImageId: !Ref LatestAmiId
-      SecurityGroups: 
-        - !GetAtt WebAppSG.GroupId
-      InstanceType: 
-        !Ref InstanceType  
-      IamInstanceProfile: !Ref InstanceProfile
-      UserData:
-         Fn::Base64: |
-            #!/bin/bash
-            AWS_AVAIL_ZONE=$(curl http://169.254.169.254/latest/meta-data/placement/availability-zone)
-            AWS_REGION=${AWS_AVAIL_ZONE::-1}
-            AWS_INSTANCE_ID=$(curl http://169.254.169.254/latest/meta-data/instance-id)
-            ROOT_VOLUME_IDS=$(aws ec2 describe-instances --region $AWS_REGION --instance-id $AWS_INSTANCE_ID --output text --query Reservations[0].Instances[0].BlockDeviceMappings[0].Ebs.VolumeId)
-            aws ec2 create-tags --resources $ROOT_VOLUME_IDS --region $AWS_REGION --tags Key=Name,Value=Project2Volume Key=Department,Value=Digital
-            yum update -y
-            yum install -y httpd
-            systemctl start httpd
-            systemctl enable httpd
-            echo '<h1>Hello World</h1>' > /var/www/html/index.html
-  Project2WebTierLoadBalancer:
-    Type: "AWS::ElasticLoadBalancingV2::LoadBalancer"
-    Properties:
-      Name: Project2WebTierLoadBalancer
-      Subnets: 
-       - !Ref Project2PublicSubnet1
-       - !Ref Project2PublicSubnet2
-      SecurityGroups: 
-        - !GetAtt ApplicationLoadBalancerSG.GroupId 
-      Tags:
-      - Key: Name
-        Value: Project2WebTierLoadBalancer
-      - Key: Department
-        Value: Digital
-  WebTierListener:
-    Type: "AWS::ElasticLoadBalancingV2::Listener"
-    Properties:
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref WebTierALBTargetGroup
-      LoadBalancerArn: !Ref Project2WebTierLoadBalancer
-      Port: "80"
-      Protocol: HTTP
-  WebTierALBTargetGroup:
-    Type: "AWS::ElasticLoadBalancingV2::TargetGroup"
-    Properties:
-      HealthCheckIntervalSeconds: 30
-      HealthCheckTimeoutSeconds: 5
-      HealthyThresholdCount: 2
-      Port: 80
-      Protocol: HTTP
-      UnhealthyThresholdCount: 5
-      VpcId: !Ref VPC
-
-  Project2Database:
-    Type: AWS::RDS::DBInstance
-    Properties:
-      VPCSecurityGroups: 
-       - !GetAtt DatabaseSG.GroupId
-      AllocatedStorage: '20'
-      PubliclyAccessible: 'false'
-      DBInstanceClass: db.t3.micro
-      Engine: MySQL
-      DBInstanceIdentifier: Project2Database
-      MasterUsername: MyName
-      MasterUserPassword: MyPassword
-      DBSubnetGroupName: !Ref DatabaseSubnetGroup
-      AutoMinorVersionUpgrade: false
-      BackupRetentionPeriod: '0'
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:    
-      - Key: Name
-        Value: Project2Database
-      - Key: Department
-        Value: Digital
-
-#must have this or your VPC isnt a VPC Database, this allows the DB to know which instances to be in
-  DatabaseSubnetGroup:
-    Type: AWS::RDS::DBSubnetGroup
-    Properties:
-      DBSubnetGroupDescription: subnet group
-      SubnetIds: 
-       - !Ref Project2PublicSubnet1
-       - !Ref Project2PublicSubnet2
-       - !Ref Project2PrivateSubnet1
-       - !Ref Project2PrivateSubnet2
-       
\ No newline at end of file
diff --git a/static/Cost/200_EC2_Scheduling_at_Scale/Code/sample_environment_template.yml b/static/Cost/200_EC2_Scheduling_at_Scale/Code/sample_environment_template.yml
deleted file mode 100644
index 7534bb15d..000000000
--- a/static/Cost/200_EC2_Scheduling_at_Scale/Code/sample_environment_template.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-
-Description: >
-  Well-Architected L200 EC2 Scheduling Lab - walab-l200-scheduling-sample-env
-
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-
-Resources:
-  IGW:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-InternetGateway"
-
-  IGWAttach:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref VPC
-      InternetGatewayId: !Ref IGW
-
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 172.31.0.0/16
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-VPC"
-      EnableDnsHostnames: true
-      EnableDnsSupport: true
-
-  PublicSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs ''
-      CidrBlock: 172.31.1.0/24
-      MapPublicIpOnLaunch: true
-
-  PublicRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-Public-RouteTable1"
-
-  PublicRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - IGW
-      - IGWAttach
-    Properties:
-      RouteTableId: !Ref PublicRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-
-  PublicSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref PublicSubnet1
-      RouteTableId: !Ref PublicRouteTable1
-
-  EC2IAMRole:
-    Type: AWS::IAM::Role
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: [ec2.amazonaws.com]
-            Action: ['sts:AssumeRole']
-      Path: /
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
-
-  EC2InstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Roles: [!Ref EC2IAMRole]
-
-  IAMRoleInlinePolicy:
-    Type: AWS::IAM::Policy
-    Properties: 
-      PolicyDocument: 
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Action:
-              - lambda:InvokeFunction
-              - cloudformation:DescribeStackResource
-            Resource: '*'
-      PolicyName: SchedulerCLIInlinePolicy
-      Roles: 
-        - !Ref EC2IAMRole
-
-  InstanceSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Allow all outbound traffic by default
-      VpcId: !Ref VPC
-      SecurityGroupEgress:
-        - IpProtocol: "-1"
-          CidrIp: 0.0.0.0/0
-
-  EC2InstanceSchedulerAdmin:
-    Type: AWS::EC2::Instance
-    DependsOn:
-        - EC2IAMRole
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t3.nano
-      AvailabilityZone: 
-        Fn::Select: 
-          - 0
-          - Fn::GetAZs: ""
-      SubnetId: !Ref PublicSubnet1
-      SecurityGroupIds:
-        - !GetAtt "InstanceSecurityGroup.GroupId"
-      IamInstanceProfile: !Ref EC2InstanceProfile
-      UserData:
-        Fn::Base64: !Sub | 
-                   #!/bin/bash
-                   yum update -y
-                   cat > /home/ec2-user/install_scheduler_cli.sh << 'EOF'
-                   mkdir /home/ec2-user/scheduler_cli
-                   cd /home/ec2-user/scheduler_cli
-                   wget https://s3.amazonaws.com/solutions-reference/aws-instance-scheduler/latest/scheduler-cli.zip
-                   unzip scheduler-cli.zip
-                   python3 setup.py install
-                   EOF
-                   chown ec2-user /home/ec2-user/install_scheduler_cli.sh
-                   chmod 755 /home/ec2-user/install_scheduler_cli.sh
-                   chown ec2-user.ec2-user -R /home/ec2-user/scheduler_cli
-                   sudo /home/ec2-user/install_scheduler_cli.sh
-      Tags:
-        - Key: Name
-          Value: walab-admin-instance
-
-  EC2Instance1:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t3.nano
-      AvailabilityZone: 
-        Fn::Select: 
-          - 0
-          - Fn::GetAZs: ""
-      SubnetId: !Ref PublicSubnet1
-      SecurityGroupIds:
-        - !GetAtt "InstanceSecurityGroup.GroupId"
-      Tags:
-        - Key: walab-environment
-          Value: dev
-        - Key: Name
-          Value: walab-sample
-  
-  EC2Instance2:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t3.nano
-      AvailabilityZone: 
-        Fn::Select: 
-          - 0
-          - Fn::GetAZs: ""
-      SubnetId: !Ref PublicSubnet1
-      SecurityGroupIds:
-        - !GetAtt "InstanceSecurityGroup.GroupId"
-      Tags:
-        - Key: walab-environment
-          Value: dev
-        - Key: Name
-          Value: walab-sample
-
-  EC2Instance3:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t3.nano
-      AvailabilityZone: 
-        Fn::Select: 
-          - 0
-          - Fn::GetAZs: ""
-      SubnetId: !Ref PublicSubnet1
-      SecurityGroupIds:
-        - !GetAtt "InstanceSecurityGroup.GroupId"
-      Tags:
-        - Key: walab-environment
-          Value: dev
-        - Key: Name
-          Value: walab-sample
-  
-  EC2Instance4:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t3.nano
-      AvailabilityZone: 
-        Fn::Select: 
-          - 0
-          - Fn::GetAZs: ""
-      SubnetId: !Ref PublicSubnet1
-      SecurityGroupIds:
-        - !GetAtt "InstanceSecurityGroup.GroupId"
-      Tags:
-        - Key: walab-environment
-          Value: dev
-        - Key: Name
-          Value: walab-sample
-
-  EC2Instance5:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t3.nano
-      AvailabilityZone: 
-        Fn::Select: 
-          - 0
-          - Fn::GetAZs: ""
-      SubnetId: !Ref PublicSubnet1
-      SecurityGroupIds:
-        - !GetAtt "InstanceSecurityGroup.GroupId"
-      Tags:
-        - Key: walab-environment
-          Value: dev
-        - Key: Name
-          Value: walab-sample
\ No newline at end of file
diff --git a/static/Cost/200_S3_Intelligent_Tiering/Code/s3lifecycle-automation.yaml b/static/Cost/200_S3_Intelligent_Tiering/Code/s3lifecycle-automation.yaml
deleted file mode 100644
index 423ea35a0..000000000
--- a/static/Cost/200_S3_Intelligent_Tiering/Code/s3lifecycle-automation.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-
-    AWSTemplateFormatVersion: '2010-09-09'
-    Parameters:
-        BucketNameParam:
-            Description: Name of the bucket to store automation result
-            Type: String
-    Resources:
-      S3LifecycleFunction:
-        Type: AWS::Lambda::Function
-        Properties:
-          Environment:
-            Variables:
-              outputbucketname:
-                Ref: BucketNameParam
-          Code:
-            ZipFile: |
-                import boto3
-                import os
-                import json
-                from botocore.exceptions import ClientError
-                from time import strftime 
-                from datetime import datetime
-
-                def lambda_handler(event, context):
-                    
-                    s3 = boto3.client('s3')
-                    client = boto3.client('sts')
-                    
-                    #define variables for formatted date, and an output file for header row
-                    now = datetime.now()
-                    current_time = now.strftime("%m-%d-%Y-%H:%M")
-                    TransitionOutput = "Bucket Name, Transition In Days, Storage Class, Transition Status"
-                    
-                    #add user identity in bucket creation
-                    user_id = client.get_caller_identity()
-                    user_role = (user_id['Arn'].split(':')[5]).split('/')[1]
-
-                    #create S3 lifecycle policy
-                    def createPolicy(Name):
-                        policy = {
-                                    'Rules': [
-                                        {
-                                            'ID': "S3IntelligentTieringLC-AddedviaAutomation-"+"-"+current_time,
-                                            'Filter': {},
-                                            'Status': 'Enabled',
-                                            'Transitions': [
-                                                {
-                                                    'Days': 0,
-                                                    'StorageClass': 'INTELLIGENT_TIERING'
-                                                },
-                                            ],
-                                            'NoncurrentVersionTransitions': [
-                                                {
-                                                    'NoncurrentDays': 0,
-                                                    'StorageClass': 'INTELLIGENT_TIERING'
-                                                },
-                                            ],
-                                        }
-                                    ]
-                                }
-                        return policy
-                    
-                    #get buckets in the account
-                    BucketNames = s3.list_buckets()
-                    for bucket in BucketNames['Buckets']:
-                        Name = bucket['Name'] 
-                        try:
-                            #Case 1 - Check the existing lifecycle policies, if there are any then skip the bucket but record it in the excel for reference
-                            result = s3.get_bucket_lifecycle_configuration(Bucket=Name) 
-                            Rules= result['Rules']
-                            if any("Transitions" in keys for keys in Rules):
-                                for Rule in Rules:
-                                    for key, value in Rule.items():
-                                        if key == 'Transitions':
-                                            Days = value[0]['Days']
-                                            StorageClass = value[0]['StorageClass']
-                                            TransitionStatus = Name + ',' + str(Days) + ',' + StorageClass + ', No changes made to S3 Lifecycle configuration' 
-                                            TransitionOutput = TransitionOutput + '\n' + TransitionStatus
-                            #Additional customization - if you want to modify existing policy, that logic will go here in else block
-                        except ClientError as err: 
-                            #Case 2 - if no lifecycle policy exists, then create and attach it to the bucket
-                            if err.response['Error']['Code'] == 'NoSuchLifecycleConfiguration':
-                                policy = createPolicy(Name)
-                                for p in policy['Rules']:
-                                    for key, value in p.items():
-                                        if key =='Transitions':
-                                            Days = value[0]['Days']
-                                            StorageClass = value[0]['StorageClass']
-                                            TransitionStatus = Name + ',' + str(Days) + ',' + StorageClass + ', Added a new S3 Lifecycle Transition Rule to S3 INT' 
-                                            TransitionOutput = TransitionOutput + '\n' + TransitionStatus
-                                s3.put_bucket_lifecycle_configuration(Bucket=Name, LifecycleConfiguration = policy)
-                            else:
-                                print ("err.response['Error']['Code']")
-                                
-                    try:
-                        s3.put_object(Body=TransitionOutput,Key='s3automationresultbucket.csv',Bucket=os.environ['outputbucketname'])
-                        body = ('your lambda function has been executed successfully. Please check the output file saved in S3 bucket - ' + os.environ['outputbucketname'] + ' and File name - s3automationresultbucket.csv')
-                    except ClientError as err:
-                        body = err.response['Error']
-                        
-                    return {
-                        'body': body
-                    }
-          Handler: index.lambda_handler
-          Timeout: 300
-          Runtime: python3.8
-          Role: !GetAtt LambdaRole.Arn
-      LambdaRole:
-        Type: AWS::IAM::Role
-        Properties:
-          AssumeRolePolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-            - Effect: Allow
-              Principal:
-                Service: lambda.amazonaws.com
-              Action: sts:AssumeRole
-          Path: /
-          Policies:
-          - PolicyName: 's3-lifecycle'
-            PolicyDocument:
-              Version: '2012-10-17'
-              Statement:
-              - Effect: Allow
-                Action:
-                - "s3:GetLifecycleConfiguration"
-                - "s3:ListAllMyBuckets"
-                - "s3:PutLifecycleConfiguration"
-                - "sts:GetCallerIdentity"
-                Resource: arn:aws:s3:::*
-          - PolicyName: 's3-lifecycle-write'
-            PolicyDocument:
-              Version: '2012-10-17'
-              Statement:
-              - Effect: Allow
-                Action:
-                - "s3:PutObject"
-                - "s3:ListAllMyBuckets"
-                - "s3:PutLifecycleConfiguration"
-                - "sts:GetCallerIdentity"
-                Resource: arn:aws:s3:::*/s3automationresultbucket.csv
\ No newline at end of file
diff --git a/static/Cost/300_Automated_CUR_Updates_and_Ingestion/Code/crawler-cfn.yml b/static/Cost/300_Automated_CUR_Updates_and_Ingestion/Code/crawler-cfn.yml
deleted file mode 100644
index 6607dbdd6..000000000
--- a/static/Cost/300_Automated_CUR_Updates_and_Ingestion/Code/crawler-cfn.yml
+++ /dev/null
@@ -1,298 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Resources:
-
-  AWSCURDatabase:
-    Type: 'AWS::Glue::Database'
-    Properties:
-      DatabaseInput:
-        ### Previous line
-        # Name: 'athenacurcfn_daily'
-        ### New line
-        Name: 'athenacurcfn'
-      CatalogId: !Ref AWS::AccountId
-
-         
-
-  AWSCURCrawlerComponentFunction:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - glue.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole'
-      Policies:
-        - PolicyName: AWSCURCrawlerComponentFunction
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                Resource: 'arn:aws:logs:*:*:*'
-              - Effect: Allow
-                Action:
-                  - 'glue:UpdateDatabase'
-                  - 'glue:UpdatePartition'
-                  - 'glue:CreateTable'
-                  - 'glue:UpdateTable'
-                  - 'glue:ImportCatalogToGlue'
-                Resource: '*'
-              - Effect: Allow
-                Action:
-                  - 's3:GetObject'
-                  - 's3:PutObject'
-                ### Previous line
-                #Resource: arn:aws:s3:::<bucket name>/DailyCUR/daily/daily*
-                ### New line
-                Resource: arn:aws:s3:::<bucket name>*
-
-                
-  AWSCURCrawlerLambdaExecutor:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: AWSCURCrawlerLambdaExecutor
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                Resource: 'arn:aws:logs:*:*:*'
-              - Effect: Allow
-                Action:
-                  - 'glue:StartCrawler'
-                Resource: '*'
-       
-
-  AWSCURCrawler:
-    Type: 'AWS::Glue::Crawler'
-    DependsOn:
-      - AWSCURDatabase
-      - AWSCURCrawlerComponentFunction
-    Properties:
-      ### Previous line
-      # Name: AWSCURCrawler-dailygran-clash
-      ### New line
-      Name: AWSCURCrawler
-      Description: A recurring crawler that keeps your CUR table in Athena up-to-date.
-      Role: !GetAtt AWSCURCrawlerComponentFunction.Arn
-      DatabaseName: !Ref AWSCURDatabase
-      Targets:
-        S3Targets:
-          ### Previous line
-          #- Path: 's3://<bucket name>/DailyCUR/daily/daily'
-          ### New line
-          - Path: 's3://<bucket name>'
-          
-            Exclusions:
-              - '**.json'
-              - '**.yml'
-              - '**.sql'
-              - '**.csv'
-              - '**.gz'
-              - '**.zip'
-              ### New line
-              - 'aws-programmatic-access-test-object'
-      SchemaChangePolicy:
-        UpdateBehavior: UPDATE_IN_DATABASE
-        DeleteBehavior: DELETE_FROM_DATABASE
-       
-
-  AWSCURInitializer:
-    Type: 'AWS::Lambda::Function'
-    DependsOn: AWSCURCrawler
-    Properties:
-      Code:
-        ZipFile: >
-          const AWS = require('aws-sdk');
-          const response = require('cfn-response');
-          exports.handler = function(event, context, callback) {
-            if (event.RequestType === 'Delete') {
-              response.send(event, context, response.SUCCESS);
-            } else {
-              const glue = new AWS.Glue();
-              glue.startCrawler({ Name: 'AWSCURCrawler-dailygran-clash' }, function(err, data) {
-                if (err) {
-                  const responseData = JSON.parse(this.httpResponse.body);
-                  if (responseData['__type'] == 'CrawlerRunningException') {
-                    callback(null, responseData.Message);
-                  } else {
-                    const responseString = JSON.stringify(responseData);
-                    if (event.ResponseURL) {
-                      response.send(event, context, response.FAILED,{ msg: responseString });
-                    } else {
-                      callback(responseString);
-                    }
-                  }
-                }
-                else {
-                  if (event.ResponseURL) {
-                    response.send(event, context, response.SUCCESS);
-                  } else {
-                    callback(null, response.SUCCESS);
-                  }
-                }
-              });
-            }
-          };
-      Handler: 'index.handler'
-      Timeout: 30
-      Runtime: nodejs8.10
-      ReservedConcurrentExecutions: 1
-      Role: !GetAtt AWSCURCrawlerLambdaExecutor.Arn
-     
-
-  AWSStartCURCrawler:
-    Type: 'Custom::AWSStartCURCrawler'
-    Properties:
-      ServiceToken: !GetAtt AWSCURInitializer.Arn
-     
-
-  AWSS3CUREventLambdaPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      Action: 'lambda:InvokeFunction'
-      FunctionName: !GetAtt AWSCURInitializer.Arn
-      Principal: 's3.amazonaws.com'
-      SourceAccount: !Ref AWS::AccountId
-      SourceArn: 'arn:aws:s3:::<bucket name>'
-     
-
-  AWSS3CURLambdaExecutor:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: AWSS3CURLambdaExecutor
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                Resource: 'arn:aws:logs:*:*:*'
-              - Effect: Allow
-                Action:
-                  - 's3:PutBucketNotification'
-                Resource: 'arn:aws:s3:::<bucket name>'
-       
-
-  AWSS3CURNotification:
-    Type: 'AWS::Lambda::Function'
-    DependsOn:
-    - AWSCURInitializer
-    - AWSS3CUREventLambdaPermission
-    - AWSS3CURLambdaExecutor
-    Properties:
-      Code:
-        ZipFile: >
-          const AWS = require('aws-sdk');
-          const response = require('cfn-response');
-          exports.handler = function(event, context, callback) {
-            const s3 = new AWS.S3();
-            const putConfigRequest = function(notificationConfiguration) {
-              return new Promise(function(resolve, reject) {
-                s3.putBucketNotificationConfiguration({
-                  Bucket: event.ResourceProperties.BucketName,
-                  NotificationConfiguration: notificationConfiguration
-                }, function(err, data) {
-                  if (err) reject({ msg: this.httpResponse.body.toString(), error: err, data: data });
-                  else resolve(data);
-                });
-              });
-            };
-            const newNotificationConfig = {};
-            if (event.RequestType !== 'Delete') {
-              newNotificationConfig.LambdaFunctionConfigurations = [{
-                Events: [ 's3:ObjectCreated:*' ],
-                LambdaFunctionArn: event.ResourceProperties.TargetLambdaArn || 'missing arn',
-                Filter: { Key: { FilterRules: [ { Name: 'prefix', Value: event.ResourceProperties.ReportKey } ] } }
-              }];
-            }
-            putConfigRequest(newNotificationConfig).then(function(result) {
-              response.send(event, context, response.SUCCESS, result);
-              callback(null, result);
-            }).catch(function(error) {
-              response.send(event, context, response.FAILED, error);
-              console.log(error);
-              callback(error);
-            });
-          };
-      Handler: 'index.handler'
-      Timeout: 30
-      Runtime: nodejs8.10
-      ReservedConcurrentExecutions: 1
-      Role: !GetAtt AWSS3CURLambdaExecutor.Arn
-     
-
-  AWSPutS3CURNotification:
-    Type: 'Custom::AWSPutS3CURNotification'
-    Properties:
-      ServiceToken: !GetAtt AWSS3CURNotification.Arn
-      TargetLambdaArn: !GetAtt AWSCURInitializer.Arn
-      BucketName: '<bucket name>'
-      ### Previous line
-      # ReportKey: 'DailyCUR/daily/daily'
-      ### New line
-      ReportKey: ''
-     
-
-  AWSCURReportStatusTable:
-    Type: 'AWS::Glue::Table'
-    DependsOn: AWSCURDatabase
-    Properties:
-      ### Previous line
-      # DatabaseName: athenacurcfn_daily
-      ### New line
-      DatabaseName: athenacurcfn
-      CatalogId: !Ref AWS::AccountId
-      TableInput:
-        Name: 'cost_and_usage_data_status'
-        TableType: 'EXTERNAL_TABLE'
-        StorageDescriptor:
-          Columns:
-            - Name: status
-              Type: 'string'
-          InputFormat: 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
-          OutputFormat: 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
-          SerdeInfo:
-            SerializationLibrary: 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
-          ### Previous line
-          # Location: 's3://<bucket name>/daily/daily/cost_and_usage_data_status/'
-          ### New line
-          Location: 's3://<bucket name>/cost_and_usage_data_status/'
-      
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/Management.yaml b/static/Cost/300_Optimization_Data_Collection/Code/Management.yaml
deleted file mode 100644
index 711dffd12..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/Management.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploys a role to management account so we can assume to read data using a lambda 
-Parameters:
-  CostAccountID:
-    Type: String
-    Description: AccountId of where the collector is deployed
-  ManagementAccountRole:
-    Type: String
-    Description: The name of the IAM role that will be deployed from the management account to linked accounts as a read only role. DO NOT ENTER THE ROLE PREFIX HERE. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT.
-    Default: "Lambda-Assume-Role-Management-Account" 
-  RolePrefix:
-    Type: String
-    Description: Keep this consistent with the prefix used for the Stacks and StackSets created as part of this lab. This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable e.g. prefix-
-    Default: "WA-"
-Outputs:
-  LambdaRole:
-    Description: Role for lambda to assume in cost account 
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn 
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}${ManagementAccountRole}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              AWS:
-                -  !Sub "arn:aws:iam::${CostAccountID}:root"
-        Version: 2012-10-17
-      Path: /
-      Policies:
-        - PolicyName: "Management-Account-permissions"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "organizations:ListAccounts"
-                  - "organizations:ListCreateAccountStatus"
-                  - "organizations:DescribeOrganization"
-                  - "organizations:ListTagsForResource"
-                  - "organizations:ListRoots"
-                  - "organizations:ListChildren"
-                  - "organizations:ListAccountsForParent"
-                  - "organizations:DescribeOrganizationalUnit"
-                  - "organizations:DescribeAccount"
-                  - "organizations:ListParents"
-                  - "organizations:ListOrganizationalUnitsForParent"
-                  - "organizations:ListChildren"
-                Resource: "*"
-        - PolicyName: "RightsizingModule"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "ce:GetRightsizingRecommendation"
-                Resource: "*"
-        - PolicyName: "AnomaliesModule"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "ce:GetAnomalies"
-                Resource: "*"
-        - PolicyName: "ComputeOptimizer-ExportLambdaFunctionRecommendations"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "compute-optimizer:ExportLambdaFunctionRecommendations"
-                  - "compute-optimizer:GetLambdaFunctionRecommendations"
-                  - "lambda:ListFunctions"
-                  - "lambda:ListProvisionedConcurrencyConfigs"
-                Resource: "*"
-        - PolicyName: "ComputeOptimizer-ExportAutoScalingGroupRecommendations"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "compute-optimizer:ExportAutoScalingGroupRecommendations"
-                  - "compute-optimizer:GetAutoScalingGroupRecommendations"
-                  - "autoscaling:DescribeAutoScalingGroups"
-                Resource: "*"
-        - PolicyName: "ComputeOptimizer-ExportEBSVolumeRecommendations"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "compute-optimizer:ExportEBSVolumeRecommendations"
-                  - "compute-optimizer:GetEBSVolumeRecommendations"
-                  - "EC2:DescribeVolumes"
-                Resource: "*"
-        - PolicyName: "ComputeOptimizer-ExportEC2InstanceRecommendations"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "compute-optimizer:ExportEC2InstanceRecommendations"
-                  - "compute-optimizer:GetEC2InstanceRecommendations"
-                  - "EC2:DescribeInstances"
-                Resource: "*"
-        - PolicyName: "ComputeOptimizer-ExportECSRecommendations"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "compute-optimizer:ExportECSServiceRecommendations"
-                  - "compute-optimizer:GetECSServiceRecommendations"
-                  - "compute-optimizer:GetECSServiceRecommendationProjectedMetrics"
-                  - "ecs:ListServices"
-                  - "ecs:ListClusters"
-                Resource: "*"
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/Optimization_Data_Collector.yaml b/static/Cost/300_Optimization_Data_Collection/Code/Optimization_Data_Collector.yaml
deleted file mode 100644
index d2ca7d1ab..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/Optimization_Data_Collector.yaml
+++ /dev/null
@@ -1,577 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Main CloudFormation template that builds shared resources and modules stacks
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: 'Deployment parameters'
-        Parameters:
-          - DestinationBucket
-          - ManagementAccountRole
-          - ManagementAccountID
-          - MultiAccountRoleName
-          - Schedule
-          - RolePrefix
-          - CFNTemplateSourceBucket
-      - Label:
-          default: 'Available modules'
-        Parameters:
-          - IncludeTAModule
-          - IncludeRightsizingModule
-          - IncludeCostAnomalyModule
-          - IncludeInventoryCollectorModule
-          - IncludeComputeOptimizerModule
-          - ComputeOptimizerRegions
-          - IncludeECSChargebackModule
-          - IncludeRDSUtilizationModule
-          - IncludeOrgDataModule
-          - IncludeTransitGatewayModule
-    ParameterLabels:
-      DestinationBucket:
-        default: 'Destination S3 bucket'
-      ManagementAccountRole:
-        default: 'Management account role'
-      ManagementAccountID:
-        default: 'Comma Delimited list of Account IDs for all Management Account IDs'
-      MultiAccountRoleName:
-        default: 'Multi Account Role Name'
-      Schedule:
-        default: "Schedule swap to cron(0 8 1 * ? *) for 1st day of the month"
-      RolePrefix:
-        default: "Role Prefix"
-      CFNTemplateSourceBucket:
-        default: "DO NOT CHANGE - A bucket that contains WA-Labs CloudFormation templates. Must be 'aws-well-architected-labs'"
-      IncludeTAModule:
-        default: 'Include AWS Trusted Advisor Data Collection Module'
-      IncludeRightsizingModule:
-        default: 'Include Rightsizing Recommendations Data Collection Module'
-      IncludeCostAnomalyModule:
-        default: 'Include Cost Anomalies ightsizing Recommendations Data Collection Module'
-      IncludeInventoryCollectorModule:
-        default: 'Include Inventory Collector Module'
-      IncludeComputeOptimizerModule:
-        default: 'Include AWS Compute Optimizer Data Collection Module'
-      ComputeOptimizerRegions:
-        default: "Comma Delimited list of AWS regions where AWS Compute Optimizer data will be collected."
-      IncludeECSChargebackModule:
-        default: 'Include ECS Chargeback Data Collection Module'
-      IncludeRDSUtilizationModule:
-        default: 'Include RDS Utilization Data Collection Module'
-      IncludeOrgDataModule:
-        default: 'Include AWS Organization Data Collection Module'
-      IncludeBudgetsModule:
-        default: 'Include AWS Budgets Collection Module'
-      IncludeTransitGatewayModule:
-        default: 'Include AWS TransitGateway Collection Module'
-Mappings:
-  RegionMap:
-       eu-west-1:        {CodeBucket: aws-well-architected-labs-ireland }
-       us-east-2:        {CodeBucket: aws-well-architected-labs-ohio }
-       us-east-1:        {CodeBucket: aws-well-architected-labs-virginia }
-       us-west-1:        {CodeBucket: aws-well-architected-labs-california }
-       us-west-2:        {CodeBucket: aws-well-architected-labs-oregon }
-       ap-southeast-1:   {CodeBucket: aws-well-architected-labs-singapore }
-       eu-central-1:     {CodeBucket: aws-well-architected-labs-frankfurt }
-       eu-west-2:        {CodeBucket: aws-well-architected-labs-london }
-       eu-north-1:       {CodeBucket: aws-well-architected-labs-stockholm }
-       ap-southeast-2:   {CodeBucket: aws-well-architected-labs-ap-sydney }
-       ap-south-1:       {CodeBucket: aws-well-architected-labs-mumbai }
-       ap-northeast-3:   {CodeBucket: aws-well-architected-labs-osaka }
-       ap-northeast-2:   {CodeBucket: aws-well-architected-labs-seoul }
-       ap-northeast-1:   {CodeBucket: aws-well-architected-labs-tokyo }
-       ca-central-1:     {CodeBucket: aws-well-architected-labs-canada }
-       eu-west-3:        {CodeBucket: aws-well-architected-labs-paris }
-       sa-east-1:        {CodeBucket: aws-well-architected-labs-san-paulo }
-Parameters:
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that needs to be created to hold information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9\-])$)
-    Default: costoptimizationdata
-  ManagementAccountRole:
-    Type: String
-    Description: The name of the IAM role that will be deployed from the management account to linked accounts as a read only role. DO NOT ENTER THE ROLE PREFIX HERE. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT.
-    Default: Lambda-Assume-Role-Management-Account
-  ManagementAccountID:
-    Type: String
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-    Description: "(Ex: 123456789,098654321,789054312) List of Payer IDs you wish to collect data for. Can just be one Accounts"
-  MultiAccountRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed from the management account to linked accounts as a read only role. DO NOT ENTER THE ROLE PREFIX HERE. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT.
-    Default: "Optimization-Data-Multi-Account-Role"
-  Schedule:
-    Type: String
-    Description: Cron job to trigger the lambda using cloudwatch event
-    Default: "rate(14 days)"
-  RolePrefix:
-    Type: String
-    Description: Keep this consistent with the prefix used for the Stacks and StackSets created as part of this lab. This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable e.g. prefix-
-    Default: "WA-"
-  CFNTemplateSourceBucket:
-    Type: String
-    Description: "DO NOT CHANGE - A bucket that contains WA-Labs CloudFormation templates. Must be 'aws-well-architected-labs'"
-    Default: "aws-well-architected-labs"
-  IncludeTAModule:
-    Type: String
-    Description: Collects AWS Trusted Advisor recommendations data
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeRightsizingModule:
-    Type: String
-    Description: "Collects AWS Cost Explorer Rightsizing Recommendations"
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeCostAnomalyModule:
-    Type: String
-    Description: "Collects AWS Cost Explorer Cost Anomalies Recommendations"
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeInventoryCollectorModule:
-    Type: String
-    Description: Collects data about AMIs, EBS volumes and snapshots  
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeComputeOptimizerModule:
-    Type: String
-    Description: Collects AWS Compute Optimizer service recommendations
-    AllowedValues:
-      - "yes"
-      - "no"
-  ComputeOptimizerRegions:
-    Default: ""
-    Type: String
-    Description: "Ex: us-east-1,us-east-2,us-west-1,us-west-2,eu-central-1,eu-west-1,eu-west-2,eu-west-3  if empty, the current region will be used. You can add regions later by updating the stack."
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-  IncludeECSChargebackModule:
-    Type: String
-    Description: Collects data which shows costs associated with ECS Tasks leveraging EC2 instances within a Cluster
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeRDSUtilizationModule:
-    Type: String
-    Description: Collects RDS CloudWatch metrics from your accounts
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeOrgDataModule:
-    Type: String
-    Description: Collects AWS Organizations data such as account Id, account name, organization parent and specified tags
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeBudgetsModule:
-    Type: String
-    Description: Collects AWS Budgets
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeTransitGatewayModule:
-    Type: String
-    Description: Collects AWS TransitGateway data
-    AllowedValues:
-      - "yes"
-      - "no"
-Outputs:
-  S3Bucket:
-    Description: Name of S3 Bucket which will store the AWS Cost Explorer Rightsizing recommendations
-    Value:
-      Ref: S3Bucket
-  S3BucketARN:
-    Description: ARN of S3 Bucket which will store the AWS Cost Explorer Rightsizing recommendations
-    Value:
-      Fn::GetAtt:
-        - S3Bucket
-        - Arn
-  RoleARN:
-    Description: "The arn of the IAM role that deployed in the management account which can retrieve AWS Organization data"
-    Value: !Sub "arn:aws:iam::${ManagementAccountID}:role/${ManagementAccountRole}"
-  TaskQueuesUrl:
-    Description: "SQS topics created for deployed modules"
-    Value:
-      Fn::Join:
-        - ','
-        - - !If [DeployTAModule, !Sub "${TrustedAdvisorModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-          - !If [DeployInventoryCollectorModule, !Sub "${InventoryCollectorModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-          - !If [DeployEcsChargebackModule, !Sub "${EcsChargebackModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-          - !If [DeployRDSUtilizationModule, !Sub "${RDSUtilizationModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-          - !If [DeployBudgetsModule, !Sub "${BudgetsModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-          - !If [DeployTransitGatewayModule, !Sub "${TransitGatewayModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-Conditions:
-  DeployTAModule: !Equals
-    - !Ref IncludeTAModule
-    - "yes"
-  DeployRightsizingModule: !Equals
-    - !Ref IncludeRightsizingModule
-    - "yes"
-  DeployCostAnomalyModule: !Equals
-    - !Ref IncludeCostAnomalyModule
-    - "yes"
-  DeployInventoryCollectorModule: !Equals
-    - !Ref IncludeInventoryCollectorModule
-    - "yes"
-  DeployComputeOptimizerModule: !Equals
-    - !Ref IncludeComputeOptimizerModule
-    - "yes"
-  DeployEcsChargebackModule: !Equals
-    - !Ref IncludeECSChargebackModule
-    - "yes"
-  DeployRDSUtilizationModule: !Equals
-    - !Ref IncludeRDSUtilizationModule
-    - "yes"
-  DeployOrgDataModule: !Equals
-    - !Ref IncludeOrgDataModule
-    - "yes"
-  DeployBudgetsModule: !Equals
-    - !Ref IncludeBudgetsModule
-    - "yes"
-  DeployTransitGatewayModule: !Equals
-    - !Ref IncludeTransitGatewayModule
-    - "yes"
-  DeployPricingModule: !Or
-    - !Condition DeployInventoryCollectorModule
-    - !Condition DeployRDSUtilizationModule
-  DeployAccountCollector: !Or
-    - !Condition DeployTAModule
-    - !Condition DeployInventoryCollectorModule
-    - !Condition DeployRDSUtilizationModule
-    - !Condition DeployEcsChargebackModule
-    - !Condition DeployBudgetsModule
-    - !Condition DeployRDSUtilizationModule
-    - !Condition DeployTransitGatewayModule
-  ComputeOptimizerRegionsIsEmpty: !Equals
-    - !Join [ '', !Split [ ' ', !Ref ComputeOptimizerRegions  ] ] # remove spaces
-    - ""
-  ProdCFNTemplateUsed: !Equals [ !Ref CFNTemplateSourceBucket,  'aws-well-architected-labs' ]
-#Reusable Resources:
-Resources:
-  S3CrawlerQue:
-    Type: AWS::SQS::Queue
-    Properties:
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      QueueName: S3CrawlerQue
-  CrawlerSQSPolicy:
-    DependsOn:
-      - S3CrawlerQue
-    Type: AWS::SQS::QueuePolicy
-    Properties:
-      Queues:
-        - Ref: S3CrawlerQue
-      PolicyDocument:
-        Id: SQSPolicy
-        Statement:
-        - Sid: SQSEventPolicy
-          Effect: Allow
-          Principal: {"Service": "s3.amazonaws.com"}
-          Action: sqs:SendMessage
-          Resource: !GetAtt S3CrawlerQue.Arn
-          Condition:
-            ArnLike:
-              aws:SourceArn: !Sub "arn:aws:s3:::${DestinationBucket}${AWS::AccountId}"
-            StringEquals:
-                'aws:SourceAccount': !Sub '${AWS::AccountId}'
-  S3Bucket:
-    DependsOn:
-      - CrawlerSQSPolicy
-      - S3CrawlerQue
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      BucketName:
-        !Sub "${DestinationBucket}${AWS::AccountId}"
-      VersioningConfiguration:
-        Status: Enabled
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      NotificationConfiguration:
-        QueueConfigurations:
-          - Event: s3:ObjectCreated:*
-            Queue: !Sub "arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:S3CrawlerQue"
-            Filter:
-              S3Key:
-                Rules:
-                - Name: prefix
-                  Value: Compute_Optimizer/
-  GlueRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}AWS-OPTICS-Glue-Crawler"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - glue.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole
-      Path: /
-      Policies:
-        - PolicyName: "Put-S3"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:GetObject"
-                Resource: !Join
-                          - ''
-                          - - !GetAtt S3Bucket.Arn
-                            - '*'
-  LambdaAnalyticsRole: #Execution role for the custom resource
-    Type: AWS::IAM::Role
-    Properties:
-      Path:
-        Fn::Sub: /${RolePrefix}/
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - sts:AssumeRole
-      ManagedPolicyArns:
-        - !Sub "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  LambdaAnalytics:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      FunctionName: !Sub ${RolePrefix}DataCollectionLab-Analytics
-      Handler: index.lambda_handler
-      MemorySize: 128
-      Role: !GetAtt LambdaAnalyticsRole.Arn
-      Timeout: 15
-      Environment:
-        Variables:
-          WA_ANALYTICS_ENDPOINT: https://okakvoavfg.execute-api.eu-west-1.amazonaws.com/
-      Code:
-        ZipFile: |
-          import os
-          import json
-          import uuid
-          import urllib3
-          import boto3
- 
-          endpoint = os.environ['WA_ANALYTICS_ENDPOINT']
-          account_id = boto3.client("sts").get_caller_identity()["Account"]
- 
-          def lambda_handler(event, context):
-              print(json.dumps(event))
-              try:
-                  if event['RequestType'].upper() not in ['CREATE', 'UPDATE', 'UPDATE']:
-                      raise Exception(f"Unknown RequestType {event['RequestType']}")
-                  action = event['RequestType'].upper()
-                  name = event['ResourceProperties']['Name']
-                  method = {'CREATE':'PUT', 'UPDATE': 'PATCH', 'DELETE': 'DELETE'}.get(action)
-                  via_key = {'CREATE':'created_via', 'UPDATE': 'updated_via', 'DELETE': 'deleted_via'}.get(action)
-                  payload = {'dashboard_id': 'data-collection-lab/' + name, 'account_id': account_id, via_key: 'CFN'}
-                  r =  urllib3.PoolManager().request(method, endpoint, body=json.dumps(payload).encode('utf-8'), headers={'Content-Type': 'application/json'})
-                  if r.status != 200:
-                      raise Exception(f"There has been an issue logging action, server did not respond with a 200 response, actual status: {r.status}, response data {r.data.decode('utf-8')}. This issue will be ignored")
-                  res, reason = 'SUCCESS', 'success'
-              except Exception as exc:
-                  res, reason = 'SUCCESS', f"{exc} . This issue will be ignored"
-              body = {
-                  'Status': res,
-                  'Reason': reason,
-                  'PhysicalResourceId': event.get('PhysicalResourceId', str(uuid.uuid1())),
-                  'StackId': event.get('StackId'),
-                  'RequestId': event.get('RequestId'),
-                  'LogicalResourceId': event.get('LogicalResourceId'),
-                  'NoEcho': False,
-                  'Data':  {'Reason': reason},
-              }
-              json_body=json.dumps(body)
-              print(json_body)
-              url = event.get('ResponseURL')
-              if not url: return
-              try:
-                  response = urllib3.PoolManager().request('PUT', url, body=json_body, headers={'content-type' : '', 'content-length' : str(len(json_body))}, retries=False)
-                  print(f"Status code: {response}")
-              except Exception as exc:
-                  print("Failed sending PUT to CFN: " + str(exc))
-  TrustedAdvisorModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployTAModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-trusted-advisor.yaml"
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        GlueRoleARN: !GetAtt GlueRole.Arn
-        MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-        CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNTemplateSourceBucket ]
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  RightsizeModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployRightsizingModule
-    Properties:
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-        ManagementRoleName: !Sub "${RolePrefix}${ManagementAccountRole}"
-        ManagementAccountID: !Ref ManagementAccountID
-        GlueRoleARN: !GetAtt GlueRole.Arn
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-cost-explorer-rightsizing.yaml"
-  CostAnomalyModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployCostAnomalyModule
-    Properties:
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        ManagementRoleName: !Sub "${RolePrefix}${ManagementAccountRole}"
-        ManagementAccountID: !Ref ManagementAccountID
-        GlueRoleARN: !GetAtt GlueRole.Arn
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-cost-explorer-cost-anomaly.yaml"
-  InventoryCollectorModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployInventoryCollectorModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-inventory.yaml"
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        GlueRoleARN: !GetAtt GlueRole.Arn
-        MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-        CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNTemplateSourceBucket ]
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  PricingModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployPricingModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-pricing.yaml"
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        RolePrefix: !Ref RolePrefix
-        CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNTemplateSourceBucket ]
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  ComputeOptimizerModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployComputeOptimizerModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-compute-optimizer.yaml"
-      Parameters:
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        DestinationBucket: !Ref S3Bucket
-        GlueRoleARN: !GetAtt GlueRole.Arn
-        ManagementRoleName: !Sub "${RolePrefix}${ManagementAccountRole}"
-        ManagementAccountID: !Ref ManagementAccountID
-        S3CrawlerQue: !GetAtt S3CrawlerQue.Arn
-        Schedule: !Ref Schedule
-        RolePrefix: !Ref RolePrefix
-        BucketPrefix:  !Ref DestinationBucket
-        DeployRegions:
-          Fn::If:
-            - ComputeOptimizerRegionsIsEmpty
-            - !Sub "${AWS::Region}"
-            - !Join [ '', !Split [ ' ', !Ref ComputeOptimizerRegions  ] ] # remove spaces
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  EcsChargebackModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployEcsChargebackModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-ecs-chargeback.yaml"
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        GlueRoleArn: !GetAtt GlueRole.Arn
-        MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-        CodeBucket: !If [ ProdCFNTemplateUsed, !FindInMap [RegionMap, !Ref "AWS::Region", CodeBucket], !Ref CFNTemplateSourceBucket ]
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  RDSUtilizationModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployRDSUtilizationModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-rds-usage.yaml"
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        GlueRoleArn: !GetAtt GlueRole.Arn
-        MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  OrgDataModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployOrgDataModule
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-organization.yaml"
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        GlueRoleARN: !GetAtt GlueRole.Arn
-        Schedule: !Ref Schedule
-        ManagementRoleName: !Sub "${RolePrefix}${ManagementAccountRole}"
-        ManagementAccountID: !Ref ManagementAccountID
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-  BudgetsModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployBudgetsModule
-    Properties:
-      Parameters:
-          DestinationBucket: !Ref S3Bucket
-          DestinationBucketARN: !GetAtt S3Bucket.Arn
-          GlueRoleArn: !GetAtt GlueRole.Arn
-          MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-          RolePrefix: !Ref RolePrefix
-          LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-budgets.yaml"
-  TransitGatewayModule:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployTransitGatewayModule
-    Properties:
-      Parameters:
-        DestinationBucket: !Ref S3Bucket
-        DestinationBucketARN: !GetAtt S3Bucket.Arn
-        GlueRoleArn: !GetAtt GlueRole.Arn
-        MultiAccountRoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-        RolePrefix: !Ref RolePrefix
-        LambdaAnalyticsARN: !GetAtt LambdaAnalytics.Arn
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/module-transit-gateway.yaml"
-  AccountCollector:
-    Type: AWS::CloudFormation::Stack
-    Condition: DeployAccountCollector
-    Properties:
-      TemplateURL: !Sub "https://${CFNTemplateSourceBucket}.s3.amazonaws.com/Cost/Labs/300_Optimization_Data_Collection/account-collector.yaml"
-      Parameters:
-        RoleARN: !Sub "arn:aws:iam::${ManagementAccountID}:role/${RolePrefix}${ManagementAccountRole}"
-        ManagementRoleName: !Sub "${RolePrefix}${ManagementAccountRole}"
-        ManagementAccountID: !Ref ManagementAccountID
-        RolePrefix: !Ref RolePrefix
-        Schedule: !Ref Schedule
-        TaskQueuesUrl:
-          Fn::Join:
-            - ','
-            - - !If [DeployTAModule, !Sub "${TrustedAdvisorModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-              - !If [DeployInventoryCollectorModule, !Sub "${InventoryCollectorModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-              - !If [DeployEcsChargebackModule, !Sub "${EcsChargebackModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-              - !If [DeployRDSUtilizationModule, !Sub "${RDSUtilizationModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-              - !If [DeployBudgetsModule, !Sub "${BudgetsModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
-              - !If [DeployTransitGatewayModule, !Sub "${TransitGatewayModule.Outputs.SQSUrl}", Ref: AWS::NoValue]
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/account-collector.yaml b/static/Cost/300_Optimization_Data_Collection/Code/account-collector.yaml
deleted file mode 100644
index 196865c9b..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/account-collector.yaml
+++ /dev/null
@@ -1,213 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Organization data collections.
-Parameters:
-  RoleARN:
-    Type: String
-    Description: ARN of the IAM role deployed in the management accounts which can retrieve AWS Org data.
-  ManagementRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed in the management account which can retrieve AWS Organization data. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT
-  ManagementAccountID:
-    Type: String
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-    Description: "(Ex: 123456789,098654321,789054312) List of Payer IDs you wish to collect data for. Can just be one Accounts"
-  TaskQueuesUrl:
-    Type: String
-    Description: the Ques URL that will get the accounts messages, split by comers
-  Schedule:
-    Type: String
-    Description: Cron job to trigger the lambda using cloudwatch event
-    Default: "rate(14 days)"
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-Outputs:
-  LambdaFunctionName:
-    Value:
-      Ref: LambdaFunction
-  LambdaFunctionARN:
-    Description: Lambda function ARN.
-    Value:
-      Fn::GetAtt:
-        - LambdaFunction
-        - Arn
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}AWS-Organization-Account-Collector-Role"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: "Assume-Management-Organization-Data-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${ManagementRoleName}" # Need to assume a Read role in all Management Accounts
-        - PolicyName: "S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/AWS-Organization-Account-Collector*"
-        - PolicyName: "Sqs-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                 - sqs:SendMessage
-                 - sqs:ReceiveMessage
-                 - sqs:DeleteMessage
-                 - sqs:GetQueueAttributes
-                Resource:
-                 - !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:TrustedAdvisorModule-TaskQueue
-                 - !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:InventoryCollectorModul-TaskQueue
-                 - !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:EcsChargebackModule-TaskQueue
-                 - !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:RDSUtilizationModule-TaskQueue
-                 - !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:BudgetsModule-TaskQueue
-                 - !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:TransitGatewayModule-TaskQueue
-                 
-
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - 'Accounts-Collector-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: LambdaFunction of python3.8.
-      Runtime: python3.8
-      Code:
-          ZipFile: |
-            import boto3
-            import logging
-            import os
-            import json
-
-            def sqs_message(account_data, QueueUrl):
-                #posts message to que
-                client = boto3.client('sqs')
-                (account_id,account_name,payer_id) = account_data
-                message = {
-                    "account_id": account_id,
-                    "account_name": account_name, 
-                    "payer_id": payer_id
-                    
-                }
-                response = client.send_message(
-                    QueueUrl=QueueUrl,
-                    MessageBody=json.dumps(message)
-                )
-                return response
-
-
-            def org_accounts(role_name, payer_id):
-                account_ids = []
-                ROLE_ARN = f"arn:aws:iam::{payer_id}:role/{role_name}"
-                sts_connection = boto3.client('sts')
-                acct_b = sts_connection.assume_role(
-                    RoleArn=ROLE_ARN,
-                    RoleSessionName="cross_acct_lambda"
-                )
-                        
-                ACCESS_KEY = acct_b['Credentials']['AccessKeyId']
-                SECRET_KEY = acct_b['Credentials']['SecretAccessKey']
-                SESSION_TOKEN = acct_b['Credentials']['SessionToken']
-
-                # create service client using the assumed role credentials
-                client = boto3.client(
-                    "organizations", region_name="us-east-1", #Using the Organization client to get the data. This MUST be us-east-1 regardless of region you have the lamda in
-                    aws_access_key_id=ACCESS_KEY,
-                    aws_secret_access_key=SECRET_KEY,
-                    aws_session_token=SESSION_TOKEN,
-                )
-                paginator = client.get_paginator("list_accounts") #Paginator for a large list of accounts
-                response_iterator = paginator.paginate()
-
-                for account in response_iterator:
-                    for ids in account['Accounts']:
-                        account_ids.append(ids)
-                logging.info("AWS Org data Gathered")
-                return account_ids
-
-
-            def lambda_handler(event, context):
-                role_name = os.environ['ROLE']
-                MANAGEMENT_ACCOUNT_IDS = os.environ['MANAGEMENT_ACCOUNT_IDS']
-                for payer_id in [r.strip() for r in MANAGEMENT_ACCOUNT_IDS.split(',')]:
-                    try: 
-                        account_info = org_accounts(role_name, payer_id)
-                        
-                        for account in account_info:
-                            if  account['Status'] == 'ACTIVE':
-                                try:
-                                    account_id = account['Id']
-                                    account_name = account['Name']
-                                    payer_id = payer_id #check format of show this sends to que, need to have in sqs for data output
-                                    account_data = (account_id, account_name, payer_id)
-                                    for que in os.environ.get("SQS_URL").split(","):
-                                        print(que)
-                                        sqs_message(account_data, que)
-                                        logging.info(f"SQS message sent for {account_id}:{account_name} from {payer_id} to {que}")
-
-                                except Exception as e:
-                                    pass
-                                    logging.warning("%s" % e)
-                            else:
-                                logging.info(f"account {account['Id']} is not active")
-                    except Exception as e:
-                        # Send some context about this error to Lambda Logs
-                        logging.warning("%s" % e)
-                        continue 
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 600
-      Role: 
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          SQS_URL: !Ref TaskQueuesUrl
-          ROLE: !Ref ManagementRoleName
-          MANAGEMENT_ACCOUNT_IDS: !Ref ManagementAccountID
-
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Scheduler-For-Accounts
-      Name: Scheduler-For-Accounts
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-              - LambdaFunction
-              - Arn
-          Id: WeeklyTriggerForGetAccounts
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/lambda_s3_athen_cf_template.yaml b/static/Cost/300_Optimization_Data_Collection/Code/lambda_s3_athen_cf_template.yaml
deleted file mode 100644
index af03960f8..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/lambda_s3_athen_cf_template.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves AWS Cost Explorer Rightsizing information from across an organization
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  ManagementAccountRole:
-    Type: String
-    Description: ARN of the IAM role deployed in the management accounts which can retrieve lambda data.
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: S3-Data
-  GlueRoleARN:
-    Type: String
-    Description: ARN of the IAM role deployed in the accounts which can run glue
-  Schedule:
-    Type: String
-    Default: "cron(30 12 L * ? *)"
-    Description: Cloud watch event Schedule to trigger the lambda 
-Outputs:
-  AthenaSavedQuery:
-    Description: This saved query will provide you a summary of your lambda data
-    Value:
-      Ref: AthenaQuery
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-  GlueCrawler:
-    Value:
-      Fn::Sub: "${CFDataName}Crawler"
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: "Assume-Management-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: 
-                  Ref: ManagementAccountRole
-        - PolicyName: !Sub "${CFDataName}-S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: !Sub "arn:aws:s3:::${DestinationBucket}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: "*"
-        - PolicyName: !Sub "${CFDataName}-Lambda-Service-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:Get*"
-                  - "s3:List*"
-                Resource: "*"
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub "${CFDataName}-Lambda-Function"
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Code:
-        ZipFile: |
-          import boto3
-          import logging
-          from datetime import date, datetime
-          import json
-          import os
-          from botocore.exceptions import ClientError
-          from botocore.client import Config
-
-          def myconverter(o):
-              if isinstance(o, datetime):
-                  return o.__str__()
-
-          def lambda_handler(event, context):
-              DestinationBucket = os.environ["BUCKET_NAME"] #Using environment variables below the lambda will use your S3 bucket
-              DestinationPrefix =  "s3_bucket"
-
-              ####CODE TO GET DATA CAN BE REPLACED######
-              client = boto3.client("s3")
-
-              with open('/tmp/data.json', 'w') as f: # Saving in the temporary folder in the lambda
-                  response = client.list_buckets()
-                  for bucket in response['Buckets']:
-                      print(bucket)
-                      bucket_objects = client.list_objects(Bucket=bucket['Name'])
-                      try:
-                          for object in bucket_objects['Contents']:
-              
-              ####CODE TO GET DATA######    
-                              jsondata = json.dumps(object, default = myconverter) #converts datetime to be able to placed in json
-
-                              f.write(jsondata)
-                              f.write('\n')
-                      except Exception as e:
-                          print(e)
-                          pass
-              print("respose gathered")
-              today = date.today()
-              year = today.year
-              month = today.month
-
-              try:
-                  s3 = boto3.client('s3', config=Config(s3={'addressing_style': 'path'}))
-                  s3.upload_file(
-                      '/tmp/data.json', DestinationBucket, f"{DestinationPrefix}-data/year={year}/month={month}/{DestinationPrefix}.json") #uploading the file with the data to s3
-                  print(f"Data in s3 - {DestinationBucket}/{DestinationPrefix}-data/year={year}/month={month}")
-              except Exception as e:
-                  print(e)
-              start_crawler()
-
-          def start_crawler():
-              glue_client = boto3.client('glue')
-              try:
-                  glue_client.start_crawler(Name=os.environ['CRAWLER_NAME'])
-              except Exception as e:
-                  # Send some context about this error to Lambda Logs
-                  logging.warning("%s" % e)     
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME:
-            Ref: DestinationBucket
-          CRAWLER_NAME:
-            Ref: Crawler
-  Crawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name:
-        !Sub "${CFDataName}Crawler"
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/"
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Weekly Notification Event for lambda data
-      Name: !Sub "${CFDataName}-Weekly-Scheduler"
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-              - LambdaFunction
-              - Arn
-          Id: WeeklyTriggerForEBSUtilization
-  AthenaQuery:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: !Sub ${CFDataName}-summary-view
-      QueryString: !Sub
-        "SELECT * from ${DatabaseName}"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName:  
-          Fn::GetAtt:
-              - LambdaFunction
-              - Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-budgets.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-budgets.yaml
deleted file mode 100644
index 63eb7c4b6..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-budgets.yaml
+++ /dev/null
@@ -1,287 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves Budgets data
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to be created to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: budgets
-  GlueRoleArn:
-    Type: String
-    Default: "cron(30 12 1 * ? *)"
-    Description: Cloud watch event Schedule to trigger the lambda 
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  AthenaSavedQuery:
-    Description: This saved query will provide you a summary of your lambda data
-    Value:
-      Ref: AthenaQuery
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-  SQSUrl:
-    Description: TaskQueue URL the account collector lambda
-    Value: !Ref TaskQueue
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${MultiAccountRoleName}" # Need to assume a Read role in all Accounts
-        - PolicyName: !Sub "${CFDataName}-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:ListBucket"
-                  - "s3:GetBucketLocation"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${Crawler}"
-              - Effect: "Allow"
-                Action:
-                  - "cloudwatch:GetMetricStatistics"
-                Resource: "*"  ## only * can be used as a Resource for this action
-              - Effect: "Allow"
-                Action:
-                  - "sqs:ReceiveMessage"
-                  - "sqs:DeleteMessage"
-                  - "sqs:GetQueueAttributes"
-                Resource: !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:BudgetsModule-TaskQueue
-              - Effect: "Allow"
-                Action:
-                  - "budgets:ViewBudget"
-                  - "budgets:Describe*"
-                Resource: !Sub "arn:aws:budgets:${AWS::Region}:${AWS::AccountId}:*"
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Code:
-        ZipFile: |
-          #Author Stephanie Gooch 2021
-          import boto3
-          import os
-          import json
-          import datetime
-          from json import JSONEncoder
-          import logging
-          from botocore.client import Config
-          from botocore.exceptions import ClientError
-
-          bucket = os.environ["BUCKET_NAME"]
-          prefix = os.environ["PREFIX"]
-          crawler = os.environ["CRAWLER_NAME"]
-          role_name = os.environ['ROLENAME']
-
-          # subclass JSONEncoder
-          class DateTimeEncoder(JSONEncoder):
-            # Override the default method
-            def default(self, obj):
-                if isinstance(obj, (datetime.date, datetime.datetime)):
-                    return obj.isoformat()
-
-          def assume_role(account_id, service):
-              role_arn = f"arn:aws:iam::{account_id}:role/{role_name}"
-              sts_client = boto3.client('sts')
-              
-              try:
-                assumedRoleObject = sts_client.assume_role(
-                    RoleArn=role_arn,
-                    RoleSessionName="cross_acct_lambda"
-                    )
-                
-                credentials = assumedRoleObject['Credentials']
-                client = boto3.client(
-                    service,
-                    aws_access_key_id=credentials['AccessKeyId'],
-                    aws_secret_access_key=credentials['SecretAccessKey'],
-                    aws_session_token=credentials['SessionToken']
-                )
-                return client
-              
-              except ClientError as e:
-                logging.warning(f"Unexpected error Account {account_id}: {e}")
-                return None
-
-          def lambda_handler(event, context):
-              try:
-                  if 'Records' not in event: 
-                      raise Exception("Please do not trigger this Lambda manually. Find an Accounts-Collector-Function-OptimizationDataCollectionStack Lambda  and Trigger from there.")
-                  for record in event['Records']:
-                      body = json.loads(record["body"])
-                      account_id = body["account_id"]
-                      account_name = body["account_name"]
-                      payer_id = body["payer_id"]
-                      print(account_id)
-                      budgets_client = assume_role(account_id, "budgets")
-                      paginator = budgets_client.get_paginator("describe_budgets") #Paginator for a large list of accounts
-                      response_iterator = paginator.paginate(AccountId=account_id)
-                      with open("/tmp/data.json", "w") as f:
-                          for budgets in response_iterator:
-                              for budget in budgets['Budgets']:
-                                  print(budget)
-                                  budget.update({'Account_ID': account_id, 'Account_Name': account_name})
-                                  if 'CostFilters' not in budget or len(budget['CostFilters']) == 0 or 'PlannedBudgetLimits' not in budget:
-                                      budget.update({'CostFilters': {'Filter': ['None']}})
-                                  dataJSONData = json.dumps(budget, cls=DateTimeEncoder)
-                                  f.write(dataJSONData)
-                                  f.write("\n")
-                      s3_upload(account_id, payer_id)
-                      start_crawler()
-              except Exception as e:
-                  logging.warning(e)
-
-          def s3_upload(account_id, payer_id):
-              if os.path.getsize("/tmp/data.json") == 0:
-                  print(f"No data in file for {prefix}")
-                  return
-              d = datetime.datetime.now()
-              month = d.strftime("%m")
-              year = d.strftime("%Y")
-              dt_string = d.strftime("%d%m%Y-%H%M%S")
-              today = datetime.date.today()
-              year = today.year
-              month = today.month
-              try:
-                  s3 = boto3.client('s3', config=Config(s3={'addressing_style': 'path'}))
-                  s3.upload_file(f'/tmp/data.json', bucket, f"{prefix}/{prefix}-data/payer_id={payer_id}/year={year}/month={month}/budgets-{account_id}.json")
-                  print(f"Budget data in s3 {bucket}")
-              except Exception as e:
-                  logging.warning("%s" % e)
-
-          def start_crawler():
-              glue_client = boto3.client("glue")
-              try:
-                  glue_client.start_crawler(Name=crawler)
-                  print(f"{crawler} has been started")
-              except Exception as e:
-                  logging.warning("%s" % e)
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME:
-            !Ref DestinationBucket
-          ACCOUNT_ID: AWS::AccountId
-          CRAWLER_NAME: !Ref Crawler
-          PREFIX: !Ref CFDataName
-          ROLENAME: !Ref MultiAccountRoleName
-  Crawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-          - '${CFDataName}-Crawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleArn
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/${CFDataName}-data/"
-  AthenaQuery:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: optimization_data
-      Description: Provides a summary view of the budgets
-      Name: budgets_view
-      QueryString:
-        CREATE OR REPLACE VIEW budgets_view AS
-        SELECT
-          budgetname budget_name
-        , CAST(budgetlimit.amount AS decimal) budget_amount
-        , CAST(calculatedspend.actualspend.amount AS decimal) actualspend
-        , CAST(calculatedspend.forecastedspend.amount AS decimal) forecastedspend
-        , timeunit
-        , budgettype budget_type
-        , account_id
-        , timeperiod.start start_date
-        , timeperiod."end"  end_date
-        , year budget_year
-        , month budget_month
-        FROM
-          optimization_data.budgets_data
-        WHERE (budgettype = 'COST')  AND costfilters.filter[1] = 'None'
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: sqs.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt TaskQueue.Arn
-  TaskQueue:
-    Type: AWS::SQS::Queue
-    Properties:
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      KmsMasterKeyId: "alias/aws/sqs"
-      QueueName: 'BudgetsModule-TaskQueue'
-  EventSourceMapping:
-    DependsOn:
-      - EventPermission
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      EventSourceArn: !GetAtt TaskQueue.Arn
-      FunctionName: !GetAtt LambdaFunction.Arn
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-compute-optimizer.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-compute-optimizer.yaml
deleted file mode 100644
index 63d02313d..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-compute-optimizer.yaml
+++ /dev/null
@@ -1,546 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves AWS Compute Optimizer information from across an organization
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to be created to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  ManagementRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed in the management account which can retrieve AWS Organization data. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT
-  ManagementAccountID:
-    Type: String
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-    Description: "(Ex: 123456789,098654321,789054312) List of Payer IDs you wish to collect data for. Can just be one Accounts"
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: compute-optimizer
-  Schedule:
-    Type: String
-    Description: Cron job to trigger the lambda using cloudwatch event
-    Default: "rate(14 days)"
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  GlueRoleARN:
-    Type: String
-  S3CrawlerQue:
-    Type: String
-    Description: SQS that will be used to trigger the crawler lambda to pull data in (Not used)
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  BucketPrefix:
-    Type: String
-    Default: 'costoptimization'
-    Description: This prefix will be used for buckets creation
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9\-])$)
-  DeployRegions:
-    Type: String
-    Description: "A comma separated list of AWS regions where compute-optimizer needs to collect info. Example: us-east-1,eu-west-1"
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-  IncludeMemberAccounts:
-    Type: String
-    AllowedValues: ["yes", "no"]
-    Default: 'yes'
-    Description: Include Member Accounts or not. Set to 'yes' when working with payer 
-Outputs:
-  LambdaARN:
-    Description: Lambda Arn
-    Value:
-       Fn::GetAtt:
-        - LambdaTriggerExport
-        - Arn
-Resources:
-  StackSetAdminRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName:  StackSetAdminRole
-      Description: "This role is used by cloudformation to create StackSets in different regions. See https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs.html"
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: cloudformation.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Policies:
-        - PolicyName: StackSetAdminRolePolicy
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              - Effect: Allow
-                Action: sts:AssumeRole
-                Resource: !Sub "arn:aws:iam::*:role/${RolePrefix}StackSetExecutionRole"
-  StackSetExecutionRole:  #see https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs.html
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}StackSetExecutionRole"
-      Description: "This role is used by cloudformation to create StackSets in different regions. See https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs.html"
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS: !GetAtt StackSetAdminRole.Arn
-            Action: sts:AssumeRole
-      Policies:
-        - PolicyName: StackSetParameterExecutionPolicy
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              - Effect: Allow
-                Action:
-                  - cloudformation:CreateStack
-                  - cloudformation:DescribeStacks
-                  - cloudformation:DeleteStack
-                  - cloudformation:UpdateStack
-                Resource: !Sub 'arn:aws:cloudformation:*:${AWS::AccountId}:stack/StackSet-${BucketPrefix}${AWS::AccountId}-comp-optim-buckets*'
-        - PolicyName: ResourcesPolicy
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              - Effect: Allow
-                Action:
-                  - s3:CreateBucket
-                  - s3:DeleteBucket
-                  - s3:ListBucket
-                  - s3:Put*
-                  - s3:Set*
-                  - s3:Get*
-                  - s3:Replicate*
-                  - s3:DeleteBucketPolicy
-                Resource:
-                  - !Sub 'arn:aws:s3:::${BucketPrefix}${AWS::AccountId}-*'
-              - Effect: Allow
-                Action:
-                  - iam:GetRole
-                  - iam:CreateRole
-                  - iam:DeleteRole
-                  - iam:PassRole
-                  - iam:DeleteRolePolicy
-                  - iam:GetRolePolicy
-                  - iam:PutRolePolicy
-                Resource:
-                  - !Sub 'arn:aws:iam::${AWS::AccountId}:role/StackSet-${BucketPrefix}*' # Shorter version of StackSetName
-  ReplicaitonBucketsStackSet:
-    Type: AWS::CloudFormation::StackSet
-    DependsOn:
-      - StackSetExecutionRole
-    Properties:
-      Description: !Sub "S3 buckets in multiple regions replicating data to s3://${DestinationBucket}."
-      PermissionModel: SELF_MANAGED
-      ManagedExecution:
-        Active: true
-      Parameters:
-        - ParameterKey: Name
-          ParameterValue: !Sub "${BucketPrefix}${AWS::AccountId}"
-        - ParameterKey: DestinationBucket
-          ParameterValue: !Ref DestinationBucket
-        - ParameterKey: ManagementAccountID
-          ParameterValue: !Ref ManagementAccountID
-      StackInstancesGroup:
-        - DeploymentTargets:
-            Accounts:
-              - !Ref "AWS::AccountId"
-          Regions: !Split [ ',', !Ref DeployRegions]
-      Capabilities:
-        - CAPABILITY_IAM
-        - CAPABILITY_NAMED_IAM
-      StackSetName: !Sub "${BucketPrefix}${AWS::AccountId}-comp-optim-buckets"
-      AdministrationRoleARN: !GetAtt [StackSetAdminRole, Arn]
-      ExecutionRoleName: !Sub "${RolePrefix}StackSetExecutionRole"
-      TemplateBody: |
-        AWSTemplateFormatVersion: '2010-09-09'
-        Description: This template creates a bucket in a given region and configure a replication to the main bucket
-        Parameters:
-          Name:
-            Type: String
-            Description: Prefix of regional bucket name
-          ManagementAccountID:
-            Type: String
-            Description: Comma separated IDs of Management Accounts that will send data to the bucket
-          DestinationBucket:
-            Type: String
-            Description: A name of the main bucket where all data will be stored
-        Resources:
-          BucketPolicy:
-            Type: AWS::S3::BucketPolicy
-            Properties:
-              Bucket: !Ref S3Bucket
-              PolicyDocument:
-                Version: 2012-10-17
-                Statement:
-                - Effect: Allow
-                  Principal:
-                    Service: compute-optimizer.amazonaws.com
-                  Action:
-                  - s3:GetBucketAcl
-                  - s3:GetBucketPolicyStatus
-                  Resource: !Sub "arn:aws:s3:::${Name}-${AWS::Region}"
-                - Effect: Allow
-                  Principal:
-                    Service: compute-optimizer.amazonaws.com
-                  Action: s3:PutObject
-                  Condition:
-                    StringEquals:
-                          s3:x-amz-acl:  bucket-owner-full-control
-                          aws:SourceAccount: !Split [',', !Ref ManagementAccountID]
-                  Resource: !Sub "arn:aws:s3:::${Name}-${AWS::Region}/*"
-                - Effect: Deny
-                  Principal: "*"
-                  Action: s3:*
-                  Condition:
-                    Bool:
-                      aws:SecureTransport: 'false'
-                  Resource:
-                    - !Sub "arn:aws:s3:::${Name}-${AWS::Region}"
-                    - !Sub "arn:aws:s3:::${Name}-${AWS::Region}/*"
-          ReplicaRole:
-            Type: AWS::IAM::Role
-            Properties:
-              AssumeRolePolicyDocument:
-                Statement:
-                - Action: ['sts:AssumeRole']
-                  Effect: Allow
-                  Principal:
-                    Service: [s3.amazonaws.com]
-          ReplicaPolicy:
-            Type: AWS::IAM::Policy
-            Properties:
-              PolicyDocument:
-                Statement:
-                - Action:
-                  - s3:GetReplicationConfiguration
-                  - s3:ListBucket
-                  Resource: !Sub arn:aws:s3:::${Name}-${AWS::Region}
-                  Effect: 'Allow'
-                - Action:
-                  - s3:GetObjectVersionForReplication
-                  - s3:GetObjectVersionAcl
-                  Resource: !Sub arn:aws:s3:::${Name}-${AWS::Region}/*
-                  Effect: 'Allow'
-                - Action:
-                  - s3:ReplicateObject
-                  - s3:ReplicateTags
-                  - s3:GetObjectVersionTagging
-                  Effect: 'Allow'
-                  Resource: !Sub arn:aws:s3:::${DestinationBucket}/*
-              PolicyName: ReplicaPolicy
-              Roles: [!Ref 'ReplicaRole']
-          S3Bucket:
-            Type: AWS::S3::Bucket
-            DeletionPolicy: Delete
-            Properties:
-              BucketName: !Sub ${Name}-${AWS::Region}
-              BucketEncryption:
-                ServerSideEncryptionConfiguration:
-                  - ServerSideEncryptionByDefault:
-                      SSEAlgorithm: AES256
-              ReplicationConfiguration:
-                Role: !GetAtt [ReplicaRole, Arn]
-                Rules:
-                  - Id: Replication to the main bucket
-                    Priority: 2
-                    Filter:
-                      Prefix: ''
-                    Destination:
-                      Bucket: !Sub arn:aws:s3:::${DestinationBucket}
-                      StorageClass: STANDARD
-                    DeleteMarkerReplication:
-                      Status: Disabled
-                    Status: Enabled
-              VersioningConfiguration:
-                Status: Enabled
-              LifecycleConfiguration:
-                Rules:
-                  - Id: Cleanup
-                    Prefix: ''
-                    Status: Enabled
-                    ExpirationInDays: 1
-                  - Id: NoncurrentCleanup
-                    Prefix: ''
-                    Status: Enabled
-                    NoncurrentVersionExpiration:
-                      NoncurrentDays: 1
-                      NewerNoncurrentVersions: 1
-              PublicAccessBlockConfiguration:
-                BlockPublicAcls : true
-                BlockPublicPolicy : true
-                IgnorePublicAcls : true
-                RestrictPublicBuckets : true
-  LambdaTriggerExportRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${ManagementRoleName}" # Need to assume a Read role in all Management Accounts
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-  LambdaTriggerExport:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub "${RolePrefix}${CFDataName}-Trigger-Export"
-      Description: "LambdaFunction to start ComputeOptimizer export jobs"
-      Handler: index.lambda_handler
-      Runtime: python3.9
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaTriggerExportRole
-          - Arn
-      Environment:
-        Variables:
-          REGIONS: !Ref DeployRegions
-          BUCKET_PREFIX: !Sub "${BucketPrefix}${AWS::AccountId}"
-          INCLUDE_MEMBER_ACCOUNTS: !Ref IncludeMemberAccounts
-          ROLE_NAME: !Ref ManagementRoleName
-          MANAGEMENT_ACCOUNT_IDS: !Ref ManagementAccountID
-      Code:
-        ZipFile: |
-          import os
-          import boto3
-          from datetime import date
-
-          BUCKET_PREFIX = os.environ["BUCKET_PREFIX"]
-          INCLUDE_MEMBER_ACCOUNTS = os.environ.get("INCLUDE_MEMBER_ACCOUNTS", 'yes').lower() == 'yes'
-          REGIONS = os.environ["REGIONS"]
-          ROLE_NAME = os.environ['ROLE_NAME']
-          ARCH = os.environ.get('ARCH', 'AWS_ARM64,CURRENT').split(',')
-
-          def lambda_handler(event, context):
-              today = date.today()
-              year = today.year
-              month = today.month
-
-              MANAGEMENT_ACCOUNT_IDS = os.environ['MANAGEMENT_ACCOUNT_IDS']
-              for payer_id in [r.strip() for r in MANAGEMENT_ACCOUNT_IDS.split(',')]:
-                  try:
-                      ROLE_ARN = f"arn:aws:iam::{payer_id}:role/{ROLE_NAME}"
-                      sts_connection = boto3.client('sts')
-                      acct_b = sts_connection.assume_role(RoleArn=ROLE_ARN, RoleSessionName="cross_acct_lambda")
-
-                      account_b_creds = {
-                        "aws_access_key_id":     acct_b['Credentials']['AccessKeyId'],
-                        "aws_secret_access_key": acct_b['Credentials']['SecretAccessKey'],
-                        "aws_session_token":     acct_b['Credentials']['SessionToken'],
-                      }
-
-                      acc = boto3.client("sts", **account_b_creds).get_caller_identity()["Account"]
-
-                      result_messages = []
-                      error_messages = []
-                      for region in [r.strip() for r in REGIONS.split(',')]:
-                          # create service client using the assumed role credentials
-                          co = boto3.client("compute-optimizer", region_name=region, **account_b_creds)
-                          pars = {'recommendationPreferences': {'cpuVendorArchitectures': ARCH}}
-                          export_funcs = {
-                              'ec2_instance': (co.export_ec2_instance_recommendations, pars),
-                              'auto_scale':   (co.export_auto_scaling_group_recommendations, pars),
-                              'lambda':       (co.export_lambda_function_recommendations, {}),
-                              'ebs_volume':   (co.export_ebs_volume_recommendations, {}),
-                              'ecs_service':  (co.export_ecs_service_recommendations, {}),
-                          }
-                          bkt = BUCKET_PREFIX + '-' + region
-                          print(f"INFO: bucket={bkt}")
-                          for name, (func, pars) in export_funcs.items():
-                              try:
-                                  res = func(
-                                      includeMemberAccounts=INCLUDE_MEMBER_ACCOUNTS,
-                                      s3DestinationConfig={'bucket': bkt, 'keyPrefix': f'compute_optimizer/compute_optimizer_{name}/payer_id={payer_id}/year={year}/month={month}'},
-                                      **pars
-                                  )
-                                  result_messages.append(f"{region} {name} export queued. JobId: {res['jobId']}")
-                              except co.exceptions.LimitExceededException:
-                                  result_messages.append(f"{region} {name} export was already queued. Skiping.")
-                              except Exception as exc:
-                                  error_messages.append(f"ERROR: {region} {name} - {exc}")
-                      if result_messages:
-                          print("Success:\n"+"\n".join(result_messages))
-                      if error_messages:
-                          raise Exception(f"There were {len(error_messages)} errors, out of {len(result_messages) + len(error_messages)} exports: \n" + "\n".join(error_messages))
-                  except Exception as e:
-                      print(payer_id, type(e), e)
-                      continue
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: !Sub "Scheduler-For-${RolePrefix}${CFDataName}"
-      Name: !Sub "Scheduler-For-${RolePrefix}${CFDataName}"
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-              - LambdaTriggerExport
-              - Arn
-          Id: TriggerForGetAccounts
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaTriggerExport.Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-  CustomRessourceFunctionFinalize:
-    Type: AWS::Lambda::Function
-    Properties:
-      Role: !GetAtt 'FinalizeLambdaExecutionRole.Arn'
-      FunctionName: !Sub "${RolePrefix}Compute-Optimizer-FinalizeSetup-DoNotRun"
-      Description: "Lambda to Finalize Setup (call trigger lambda) or Start teardown (Cleanup buckets)"
-      Runtime: python3.8
-      Architectures: [ arm64 ]
-      Code:
-        ZipFile: |
-          import os
-          import uuid
-          import json
-          import boto3
-          import botocore
-          import urllib3
-
-          REGIONS = os.environ['REGIONS'].replace(' ', '').split(',')
-          BUCKET_PREFIX = os.environ['BUCKET_PREFIX']
-          LAMBDA_ARN = os.environ['TRIGGER_LAMBDA']
-
-          def lambda_handler(event, context):
-              print(event)
-              type_ = event.get('RequestType', 'Undef')
-              if type_ == 'Create': res = on_create()
-              elif type_ == 'Delete': res = on_delete()
-              else: res = (True, f"Not supported operation: {type_}")
-              response_data = {'Reason': res[1], 'uuid': str(uuid.uuid1()) }
-
-              url = event.get('ResponseURL')
-              body = {}
-              body['Status'] = 'SUCCESS' if res[0] else 'FAILED'
-              body['Reason'] = str(res[1]) + '\nSee the details in CloudWatch Log Stream: ' + context.log_stream_name
-              body['PhysicalResourceId'] = context.log_stream_name
-              body['StackId'] = event.get('StackId')
-              body['RequestId'] = event.get('RequestId')
-              body['LogicalResourceId'] = event.get('LogicalResourceId')
-              body['NoEcho'] = False
-              body['Data'] = response_data
-              print(body)
-              if not url: return
-              json_body=json.dumps(body)
-              try:
-                  http = urllib3.PoolManager()
-                  response = http.request('PUT', url, body=json_body, headers={'content-type' : '', 'content-length' : str(len(json_body))}, retries=False)
-                  print(f"Status code: {response}" )
-              except Exception as exc:
-                  print("send(..) failed executing requests.put(..): " + str(exc))
-
-          def on_create():
-              try:
-                  name = LAMBDA_ARN.split(':')[-1]
-                  boto3.client('lambda').invoke(FunctionName=name, InvocationType="RequestResponse", Payload='{}')
-                  return (True, f'INFO: Invoked {name}')
-              except Exception as exc:
-                  return (True, f'ERROR: error invoking lambda {exc}')
-
-          def on_delete():
-              # Delete all buckets (CF cannot delete if they are non-empty)
-              s3 = boto3.resource('s3')
-              log = []
-              for region in REGIONS:
-                  name = BUCKET_PREFIX + "-" + region
-                  try:
-                      bucket = s3.Bucket(name)
-                      bucket.object_versions.delete()
-                      log.append(f'INFO:  {name} is empty now')
-                      bucket.delete()
-                      log.append(f'INFO:  {name} deleted')
-                  except botocore.exceptions.ClientError as exc:
-                      status = exc.response["ResponseMetadata"]["HTTPStatusCode"]
-                      errcode = exc.response["Error"]["Code"]
-                      if status == 404:
-                          log.append(f'INFO:  {name} - {errcode}')
-                      else:
-                          log.append(f'ERROR: {name} - {errcode}')
-                  except Exception as exc:
-                      log.append(f'ERROR: {name} Error: {exc}')
-              print('\n'.join(log))
-              return (True, '\n'.join(log))
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Environment:
-        Variables:
-          REGIONS: !Ref DeployRegions
-          BUCKET_PREFIX: !Sub "${BucketPrefix}${AWS::AccountId}"
-          TRIGGER_LAMBDA:  !GetAtt LambdaTriggerExport.Arn
-  FinalizeLambdaExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - sts:AssumeRole
-      Path: /
-      Policies:
-        - PolicyName: root
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              - Effect: Allow
-                Action:
-                  - lambda:InvokeAsync
-                  - lambda:InvokeFunction
-                Resource: !GetAtt LambdaTriggerExport.Arn
-              - Effect: Allow
-                Action:
-                  - s3:DeleteObject
-                  - s3:DeleteObjectVersion
-                Resource: !Sub 'arn:aws:s3:::${BucketPrefix}${AWS::AccountId}-*/*'
-              - Effect: Allow
-                Action:
-                  - s3:ListBucketVersions
-                  - s3:DeleteBucket
-                Resource: !Sub 'arn:aws:s3:::${BucketPrefix}${AWS::AccountId}-*'
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-  FinalizeSetup:
-    DependsOn:
-      - LambdaTriggerExport
-      - ReplicaitonBucketsStackSet
-      - FinalizeLambdaExecutionRole
-    Type: Custom::CustomResource
-    Properties:
-      ServiceToken: !GetAtt CustomRessourceFunctionFinalize.Arn
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-cost-anomaly.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-cost-anomaly.yaml
deleted file mode 100644
index e79df2860..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-cost-anomaly.yaml
+++ /dev/null
@@ -1,297 +0,0 @@
-AWSTemplateFormatVersion: "2010-09-09"
-Description: Retrieves AWS Cost Explorer Cost Anomalies details accross AWS organization
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that exists or needs to be created to hold costanomaly information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold costanomaly information
-  ManagementRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed in the management account which can retrieve AWS Organization data. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT
-  ManagementAccountID:
-    Type: String
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-    Description: "(Ex: 123456789,098654321,789054312) List of Payer IDs you wish to collect data for. Can just be one Accounts"
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: cost-explorer-cost-anomaly
-  Schedule:
-    Type: String
-    Default: "cron(15 0 * * ? *)"
-    Description: CloudWatch event Schedule to trigger the lambda
-  GlueRoleARN:
-    Type: String
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  CostExplorerCostAnomalyLambdaRoleARN:
-    Description: Role for Lambda execution of AWS Cost Explorer CostAnomaly recommendations.
-    Value:
-      Fn::GetAtt:
-        - CostAnomalyLambdaRole
-        - Arn
-  LambdaCostExplorerCostAnomalyARN:
-    Description: Lambda function ARN for retrieving AWS Cost Explorer CostAnomaly recommendations
-    Value:
-      Fn::GetAtt:
-        - LambdaFunction
-        - Arn
-  GlueCrawler:
-    Value:
-      Ref: CostAnomalyCrawler
-Resources:
-  CostAnomalyLambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}AWS-Cost-Explorer-CostAnomaly-Execute-Lambda"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: "Assume-Management-CostAnomaly-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${ManagementRoleName}" # Need to assume a Read role in all Management accounts
-        - PolicyName: "CostAnomaly-S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:GetObject"
-                  - "s3:PutObjectAcl"
-                Resource:
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "s3:ListBucket"
-                Resource:
-                  - !Sub "${DestinationBucketARN}"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${CostAnomalyCrawler}"
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-        - "${CFDataName}-${Id}"
-        - Id: !Select [0, !Split ["-", !Ref AWS::StackName]]
-      Description: LambdaFunction to retreive AWS Cost Anomalies
-      Runtime: python3.10
-      Code:
-        ZipFile: |
-          import os
-          import json
-          import logging
-          from datetime import date, timedelta, datetime
-
-          import boto3
-          from boto3.s3.transfer import S3Transfer
-
-          BUCKET = os.environ['S3_BUCKET']
-          ROLE = os.environ['ROLE']
-          PREFIX = os.environ['PREFIX']
-          CRAWLER_NAME = os.environ['CRAWLER_NAME']
-          MANAGEMENT_ACCOUNT_IDS = os.environ['MANAGEMENT_ACCOUNT_IDS']
-
-          def start_crawler():
-              glue = boto3.client('glue')
-              try:
-                  glue.start_crawler(Name=CRAWLER_NAME)
-              except Exception as exc:
-                  logging.warning(exc)
-
-          def store_data_to_s3(flattened_data, path):
-              today = date.today()
-              year = today.year
-              month = today.strftime('%m')
-              day = today.day
-              local_file = '/tmp/tmp.json'
-              with open(local_file, 'w') as f:
-                  f.write('\n'.join([json.dumps(result) for result in flattened_data]))
-              if os.path.getsize(local_file) == 0:
-                  print(f"No data in file for {path}")
-                  return
-              s3client = boto3.client('s3')
-              key = today.strftime(f"{path}/year={year}/month={month}/day={day}/{year}-{month}-{day}.json")
-              print(f"Uploading file {local_file} to {BUCKET}/{key}")
-              S3Transfer(s3client).upload_file(local_file, BUCKET, key, extra_args={'ACL': 'bucket-owner-full-control'})
-              print('file upload successful')
-
-          def get_ce_costanomaly(ce, start_date, end_date):
-              results = []
-              next_token = None
-              while True:
-                  params = dict(
-                      DateInterval={
-                        'StartDate': str(start_date),
-                        'EndDate': str(end_date)
-                      },
-                      MaxResults=100,
-                  )
-                  if next_token:
-                      params['NextPageToken'] = next_token
-                  response = ce.get_anomalies(**params)
-                  results += response['Anomalies']
-                  if 'NextPageToken' in response:
-                      next_token = response['NextPageToken']
-                  else:
-                      break
-              return results
-
-          def flatten_results(results):
-              flattened_results = []
-              for anomaly in results:
-                  flattened_anomaly = {
-                      'AnomalyId': get_value_by_path(anomaly, 'AnomalyId'),
-                      'AnomalyStartDate': get_value_by_path(anomaly, 'AnomalyStartDate'),
-                      'AnomalyEndDate': get_value_by_path(anomaly, 'AnomalyEndDate'),
-                      'DimensionValue': get_value_by_path(anomaly, 'DimensionValue'),
-                      'MaxImpact': get_value_by_path(anomaly, 'Impact/MaxImpact'),
-                      'TotalActualSpend': get_value_by_path(anomaly, 'Impact/TotalActualSpend'),
-                      'TotalExpectedSpend': get_value_by_path(anomaly, 'Impact/TotalExpectedSpend'),
-                      'TotalImpact': get_value_by_path(anomaly, 'Impact/TotalImpact'),
-                      'TotalImpactpercentage': get_value_by_path(anomaly, 'Impact/TotalImpactPercentage', 0),
-                      'MonitorArn': get_value_by_path(anomaly, 'MonitorArn'),
-                      'LinkedAccount': get_value_by_path(anomaly, 'RootCauses/0/LinkedAccount'),
-                      'LinkedAccountName': get_value_by_path(anomaly, 'RootCauses/0/LinkedAccountName'),
-                      'Region': get_value_by_path(anomaly, 'RootCauses/0/Region'),
-                      'Service': get_value_by_path(anomaly, 'RootCauses/0/Service'),
-                      'UsageType': get_value_by_path(anomaly, 'RootCauses/0/UsageType')
-                  }
-                  flattened_results.append(flattened_anomaly)
-              return flattened_results
-
-          def get_value_by_path(data, path, default=None):
-              keys = path.split("/")
-              current = data
-              for key in keys:
-                  if isinstance(current, dict) and key in current:
-                      current = current.get(key, default)
-                  elif isinstance(current, list):
-                      try:
-                          index = int(key)
-                          current = current[index]
-                      except (ValueError, IndexError):
-                          return default
-                  else:
-                      return default
-              return current
-
-          def calculate_dates(s3_path):
-              end_date = datetime.now().date()
-              start_date = datetime.now().date() - timedelta(days=90) #Cost anomalies are available for last 90days
-
-              # Check the create time of objects in the S3 bucket
-              paginator = boto3.client('s3').get_paginator('list_objects_v2')
-              contents = sum( [page.get('Contents', []) for page in paginator.paginate(Bucket=BUCKET, Prefix=s3_path)], [])
-              last_modified_date = get_last_modified_date(contents)
-              if last_modified_date and last_modified_date >= start_date:
-                  start_date = last_modified_date
-              return start_date, end_date
-
-          def get_last_modified_date(contents):
-              last_modified_dates = [obj['LastModified'].date() for obj in contents]
-              last_modified_dates_within_90_days = [date for date in last_modified_dates if date >= datetime.now().date() - timedelta(days=90)]
-              if last_modified_dates_within_90_days:
-                  return max(last_modified_dates_within_90_days)
-              return None
-
-          def lambda_handler(event, context):
-              logger = logging.getLogger()
-              sts = boto3.client('sts')
-              start_date, end_date = calculate_dates(s3_path=f'{PREFIX}/cost-anomaly-data/')
-              print(f'start_date={start_date}, end_date={end_date}')
-              total_count = 0
-              for payer_id in [r.strip() for r in MANAGEMENT_ACCOUNT_IDS.split(',')]:
-                  ROLE_ARN = f"arn:aws:iam::{payer_id}:role/{ROLE}"
-                  try:
-                      creds = sts.assume_role(RoleArn=ROLE_ARN, RoleSessionName="cross_acct_lambda")['Credentials']
-                      assumed_role_session = boto3.session.Session(
-                          aws_access_key_id=creds['AccessKeyId'],
-                          aws_secret_access_key=creds['SecretAccessKey'],
-                          aws_session_token=creds['SessionToken']
-                      )
-                      ce = assumed_role_session.client("ce", "us-east-1")
-                      data = get_ce_costanomaly(ce, start_date, end_date)
-                      flattened_data = flatten_results(data)
-                      total_count += len(flattened_data)
-                      store_data_to_s3(flattened_data, f'{PREFIX}/cost-anomaly-data/payer_id={payer_id}')
-                  except Exception as exc:
-                      print(exc)
-              if total_count:
-                  start_crawler()
-              return "Successful"
-      Handler: "index.lambda_handler"
-      MemorySize: 2688
-      Timeout: 600
-      Role: !GetAtt CostAnomalyLambdaRole.Arn
-      Environment:
-        Variables:
-          PREFIX: !Ref CFDataName
-          S3_BUCKET: !Ref DestinationBucket
-          CRAWLER_NAME: !Ref CostAnomalyCrawler
-          MANAGEMENT_ACCOUNT_IDS: !Ref ManagementAccountID
-          ROLE: !Ref ManagementRoleName
-
-  CostAnomalyCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-        - "${CFDataName}-Crawler-${Id}"
-        - Id: !Select [0, !Split ["-", !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/cost-anomaly-data/"
-
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Notification Event for lambda trigger
-      Name: !Sub "${CFDataName}-Scheduler"
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn: !GetAtt LambdaFunction.Arn
-          Id: TriggerLambda
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref "AWS::AccountId"
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-rightsizing.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-rightsizing.yaml
deleted file mode 100644
index 53fa291af..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-cost-explorer-rightsizing.yaml
+++ /dev/null
@@ -1,522 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves AWS Cost Explorer Rightsizing information from across an organization
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that exists or needs to be created to hold rightsizing information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  ManagementRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed in the management account which can retrieve AWS Organization data. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT
-  ManagementAccountID:
-    Type: String
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-    Description: "(Ex: 123456789,098654321,789054312) List of Payer IDs you wish to collect data for. Can just be one Accounts"
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: cost-explorer-rightsizing
-  Schedule:
-    Type: String
-    Default: "cron(30 12 L * ? *)"
-    Description: Cloud watch event Schedule to trigger the lambda 
-  GlueRoleARN:
-    Type: String
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  CostExplorerRightsizingLambdaRoleARN:
-    Description: Role for Lambda execution of AWS Cost Explorer Rightsizing recommendations.
-    Value:
-      Fn::GetAtt:
-        - RightsizingLambdaRole
-        - Arn
-  LambdaCostExplorerRightsizingARN:
-    Description: Lambda function ARN for retrieving AWS Cost Explorer Rightsizing recommendations
-    Value:
-      Fn::GetAtt:
-        - LambdaFunction
-        - Arn
-  GlueCrawler:
-    Value:
-      Ref: RightsizingCrawler
-Resources:
-  RightsizingLambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}AWS-Cost-Explorer-Rightsizing-Execute-Lambda"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: "Assume-Management-Rightsizing-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${ManagementRoleName}" # Need to assume a Read role in the Management Accounts
-        - PolicyName: "Rightsizing-S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${RightsizingCrawler}"
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws-cost-explorer-rightsizing-recommendations-function*"
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: LambdaFunction to retreive list of organization
-      Runtime: python3.8
-      Code:
-        ZipFile: |
-          import boto3.session
-          import boto3
-          from boto3.s3.transfer import S3Transfer
-          import logging
-          from datetime import date
-          import datetime
-          import json
-          import os
-
-          BENEFITS_CONSIDERED = True
-          bucket = os.environ['S3_BUCKET']
-          CRAWLER_NAME = os.environ['CRAWLER_NAME']
-          prefix = os.environ['PREFIX']
-
-          def start_crawler():
-              glue_client = boto3.client('glue')
-              try:
-                  glue_client.start_crawler(Name=CRAWLER_NAME)
-              except Exception as e:
-                  # Send some context about this error to Lambda Logs
-                  logging.warning("%s" % e)
-
-          def store_data_to_s3(data, path, payer_id):
-              today = date.today()
-              year = today.year
-              month = today.strftime('%m')
-              day = today.day
-              local_file = '/tmp/tmp.json'
-
-              with open(local_file, 'w') as f:
-                  json.dump(data, f, default=str)
-                  f.write('\n')
-
-              if os.path.getsize(local_file) == 0:
-                  print(f"No data in file for {path}")
-                  return
-
-              s3client = boto3.client('s3')
-              key = f"{path}/{path}-data/payer_id={payer_id}/year={year}/month={month}/day={day}/{year}-{month}-{day}.json"
-              print(f"Uploading file {local_file} to {bucket}/{key}")
-              S3Transfer(s3client).upload_file(local_file, bucket, key, extra_args={'ACL': 'bucket-owner-full-control'})
-              print('file upload successful')
-
-          def lambda_handler(event, context):
-
-              logger = logging.getLogger()
-              logger.setLevel(logging.INFO)
-
-              sts_connection = boto3.client('sts')
-
-              role_name = os.environ['ROLE']
-              MANAGEMENT_ACCOUNT_IDS = os.environ['MANAGEMENT_ACCOUNT_IDS']
-              
-              for payer_id in [r.strip() for r in MANAGEMENT_ACCOUNT_IDS.split(',')]:
-                  ROLE_ARN = f"arn:aws:iam::{payer_id}:role/{role_name}"
-                  try:
-                      assumed_role = sts_connection.assume_role(
-                                      RoleArn=ROLE_ARN,
-                                      RoleSessionName="cross_acct_lambda"
-                                  )
-                      ACCESS_KEY = assumed_role['Credentials']['AccessKeyId']
-                      SECRET_KEY = assumed_role['Credentials']['SecretAccessKey']
-                      SESSION_TOKEN = assumed_role['Credentials']['SessionToken']
-
-                      assumed_role_session = boto3.session.Session(aws_access_key_id=ACCESS_KEY,
-                                                                  aws_secret_access_key=SECRET_KEY,
-                                                                  aws_session_token=SESSION_TOKEN)
-
-                      cost_explorer = assumed_role_session.client("ce", "us-east-1")
-
-                      today = date.today()
-                      datestr = today.strftime('%Y') + '-' + today.strftime('%m') + '-' + today.strftime('%d')
-                      
-                      RECOMMENDATION_TARGET = 'SAME_INSTANCE_FAMILY'
-                      
-                      token = None
-                      result = {"RecommendationDate": datestr,
-                                          "RightsizingRecommendationsSameFamily":[],
-                                          "RightsizingRecommendationsCrossFamily":[]
-                                  }
-                      while True:
-                          kwargs = {}
-                          if token:
-                              kwargs = {"NextPageToken": token}
-                          response = cost_explorer.get_rightsizing_recommendation(
-                                  Service='AmazonEC2',
-                                  Configuration={
-                                      'RecommendationTarget': RECOMMENDATION_TARGET,
-                                      'BenefitsConsidered': BENEFITS_CONSIDERED
-                                  },
-                                  PageSize=5000,
-                                  **kwargs)
-                          print("Same family Data")
-                          print(response)
-                          result["RightsizingRecommendationsSameFamily"] += response["RightsizingRecommendations"]
-                          print(response["RightsizingRecommendations"])
-                          
-                          RECOMMENDATION_TARGET = 'CROSS_INSTANCE_FAMILY'
-                          token = None
-                          kwargs = {}
-                          if token:
-                              kwargs = {"NextPageToken": token}
-                          response = cost_explorer.get_rightsizing_recommendation(
-                                  Service='AmazonEC2',
-                                  Configuration={
-                                      'RecommendationTarget': RECOMMENDATION_TARGET,
-                                      'BenefitsConsidered': BENEFITS_CONSIDERED
-                                  },
-                                  PageSize=5000,
-                                  **kwargs)
-                          print("Cross family Data")
-                          print(response)
-                          result["RightsizingRecommendationsCrossFamily"] += response["RightsizingRecommendations"]
-                          print(response["RightsizingRecommendations"])
-
-                          token = response.get("NextPageToken", None)
-                          if not token:
-                              break
-                      store_data_to_s3(result, prefix, payer_id)
-                      start_crawler()
-                      return "Successful"
-
-
-                  except Exception as e:
-                      # Send some context about this error to Lambda Logs
-                      logging.warning("%s" % e)
-                      continue 
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 600
-      Role:
-        Fn::GetAtt:
-          - RightsizingLambdaRole
-          - Arn
-      Environment:
-        Variables:
-          PREFIX: !Ref CFDataName
-          S3_BUCKET: !Ref DestinationBucket
-          CRAWLER_NAME: !Ref RightsizingCrawler
-          RECOMMENDATION_TARGET: 'SAME_INSTANCE_FAMILY'
-          ROLE: !Ref ManagementRoleName
-          MANAGEMENT_ACCOUNT_IDS: !Ref ManagementAccountID
-  RightsizingCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-          - '${CFDataName}-Crawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/${CFDataName}-data/"
-  
-  AthenaQuerySameFamilyRightSizing:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the rightsizing recommendations for same family
-      Name: cost-explorer-rightsizing-same-family
-      QueryString: |
-        --  Click Create as view then you can run from that
-
-        WITH rightsizing_dates AS (
-            SELECT "recommendations"."currentinstance"."resourceid"          AS "instance_id"
-                , min(date_parse(concat("year", "month", "day"), '%Y%m%d')) AS "earliest_date"
-                , max(date_parse(concat("year", "month", "day"), '%Y%m%d')) AS "latest_date"
-                , count(*)                                                  AS "frequency"
-            FROM (optimization_data.cost_explorer_rightsizing_data
-                CROSS JOIN UNNEST("rightsizingrecommendationssamefamily") t(recommendations))
-            GROUP BY 1
-        ),
-            data AS (
-                SELECT recommendations
-                FROM (optimization_data.cost_explorer_rightsizing_data
-                    CROSS JOIN UNNEST("rightsizingrecommendationssamefamily") t(recommendations))
-                WHERE ("date_parse"("concat"("year", "month", "day"), '%Y%m%d') >= (current_timestamp - INTERVAL '7' DAY))
-
-            ),
-            all_tags AS (
-                SELECT "recommendations"."currentinstance"."resourceid" AS "instance_id"
-                    , tags.key
-                    , "tags"."values"[1]                               as "value"
-                FROM data
-                    CROSS JOIN UNNEST("recommendations"."currentinstance"."tags") AS t(tags)
-            ),
-            chosen_tags AS (
-
-                SELECT instance_id
-                    , kv['user:Name'] AS "Name"
-                FROM (
-                    SELECT instance_id
-                        , map_agg(key, value) AS kv
-                    FROM all_tags
-                    GROUP BY instance_id
-                )
-            ),
-            recs AS (
-                SELECT "recommendations"."currentinstance"."resourceid"                                          AS "instance_id"
-                    , "recommendations"."currentinstance"."instancename"                                        AS "instance_name"
-                    , "recommendations"."accountid"                                                             AS "account_id"
-                    , "recommendations"."currentinstance"."resourcedetails"."ec2resourcedetails"."instancetype" AS "instance_type"
-                    , CAST((CASE WHEN (
-                        "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxcpuutilizationpercentage" =
-                        '') THEN null
-                                  ELSE "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxcpuutilizationpercentage"
-                            END) AS double)                                                                     AS "max_cpu_utilization"
-                    , CAST((CASE WHEN (
-                        "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxmemoryutilizationpercentage" =
-                        '') THEN null
-                                  ELSE "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxmemoryutilizationpercentage"
-                            END) AS double)                                                                     AS "max_memory_utilization"
-                    , CAST((CASE WHEN (
-                        "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxstorageutilizationpercentage" =
-                        '') THEN null
-                                  ELSE "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxstorageutilizationpercentage"
-                            END) AS double)                                                                     AS "max_disk_utilization"
-                    , "recommendations"."rightsizingtype"                                                       AS "recommended_action"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify')
-                                THEN "recommendations"."modifyrecommendationdetail"."targetinstances"[1]."resourcedetails"."ec2resourcedetails"."instancetype"
-                            ELSE ''
-                        END)                                                                                     AS "recommended_instance_type_1"
-                    , CAST("recommendations"."currentinstance"."monthlycost" AS double)                         AS "current_monthly_cost"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[1]."estimatedmonthlycost" AS double)
-                            ELSE 0.0
-                        END)                                                                                     AS "estimated_monthly_cost_type_1"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[1]."estimatedmonthlysavings" AS double)
-                            ELSE CAST("recommendations"."currentinstance"."monthlycost" AS double)
-                        END)                                                                                     AS "estimated_monthly_savings_type_1"
-                      , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify')
-                                THEN "recommendations"."modifyrecommendationdetail"."targetinstances"[2]."resourcedetails"."ec2resourcedetails"."instancetype"
-                            ELSE ''
-                        END)                                                                                     AS "recommended_instance_type_2"
-                    , CAST("recommendations"."currentinstance"."monthlycost" AS double)                         AS "current_monthly_cost"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[2]."estimatedmonthlycost" AS double)
-                            ELSE 0.0
-                        END)                                                                                     AS "estimated_monthly_cost_type_2"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[2]."estimatedmonthlysavings" AS double)
-                            ELSE CAST("recommendations"."currentinstance"."monthlycost" AS double)
-                        END)                                                                                     AS "estimated_monthly_savings_type_2"
-                , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify')
-                                THEN "recommendations"."modifyrecommendationdetail"."targetinstances"[3]."resourcedetails"."ec2resourcedetails"."instancetype"
-                            ELSE ''
-                        END)                                                                                     AS "recommended_instance_type_3"
-                    , CAST("recommendations"."currentinstance"."monthlycost" AS double)                         AS "current_monthly_cost"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[3]."estimatedmonthlycost" AS double)
-                            ELSE 0.0
-                        END)                                                                                     AS "estimated_monthly_cost_type_3"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[3]."estimatedmonthlysavings" AS double)
-                            ELSE CAST("recommendations"."currentinstance"."monthlycost" AS double)
-                        END)                                                                                     AS "estimated_monthly_savings_type_3"
-                FROM data
-            )
-        SELECT recs.*
-            , rightsizing_dates.earliest_date
-            , rightsizing_dates.latest_date
-            , rightsizing_dates.frequency
-            , chosen_tags.name
-        FROM recs
-            JOIN      rightsizing_dates ON ("rightsizing_dates"."instance_id" = "recs"."instance_id")
-            LEFT JOIN chosen_tags ON ("chosen_tags"."instance_id" = "recs"."instance_id")
-  AthenaQueryCrossFamilyRightSizing:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the rightsizing recommendations for cross family
-      Name: cost-explorer-rightsizing-cross-family
-      QueryString: |
-        --  Click Create as view then you can run from that
-
-        WITH rightsizing_dates AS (
-            SELECT "recommendations"."currentinstance"."resourceid"          AS "instance_id"
-                , min(date_parse(concat("year", "month", "day"), '%Y%m%d')) AS "earliest_date"
-                , max(date_parse(concat("year", "month", "day"), '%Y%m%d')) AS "latest_date"
-                , count(*)                                                  AS "frequency"
-            FROM (optimization_data.cost_explorer_rightsizing_data
-                CROSS JOIN UNNEST("rightsizingrecommendationscrossfamily") t(recommendations))
-            GROUP BY 1
-        ),
-            data AS (
-                SELECT recommendations
-                FROM (optimization_data.cost_explorer_rightsizing_data
-                    CROSS JOIN UNNEST("rightsizingrecommendationscrossfamily") t(recommendations))
-                WHERE ("date_parse"("concat"("year", "month", "day"), '%Y%m%d') >= (current_timestamp - INTERVAL '7' DAY))
-
-            ),
-            all_tags AS (
-                SELECT "recommendations"."currentinstance"."resourceid" AS "instance_id"
-                    , tags.key
-                    , "tags"."values"[1]                               as "value"
-                FROM data
-                    CROSS JOIN UNNEST("recommendations"."currentinstance"."tags") AS t(tags)
-            ),
-            chosen_tags AS (
-
-                SELECT instance_id
-                    , kv['user:Name'] AS "Name"
-                FROM (
-                    SELECT instance_id
-                        , map_agg(key, value) AS kv
-                    FROM all_tags
-                    GROUP BY instance_id
-                )
-            ),
-            recs AS (
-                SELECT "recommendations"."currentinstance"."resourceid"                                          AS "instance_id"
-                    , "recommendations"."currentinstance"."instancename"                                        AS "instance_name"
-                    , "recommendations"."accountid"                                                             AS "account_id"
-                    , "recommendations"."currentinstance"."resourcedetails"."ec2resourcedetails"."instancetype" AS "instance_type"
-                    , CAST((CASE WHEN (
-                        "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxcpuutilizationpercentage" =
-                        '') THEN null
-                                  ELSE "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxcpuutilizationpercentage"
-                            END) AS double)                                                                     AS "max_cpu_utilization"
-                    , CAST((CASE WHEN (
-                        "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxmemoryutilizationpercentage" =
-                        '') THEN null
-                                  ELSE "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxmemoryutilizationpercentage"
-                            END) AS double)                                                                     AS "max_memory_utilization"
-                    , CAST((CASE WHEN (
-                        "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxstorageutilizationpercentage" =
-                        '') THEN null
-                                  ELSE "recommendations"."currentinstance"."resourceutilization"."ec2resourceutilization"."maxstorageutilizationpercentage"
-                            END) AS double)                                                                     AS "max_disk_utilization"
-                    , "recommendations"."rightsizingtype"                                                       AS "recommended_action"
-                                        , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify')
-                                THEN "recommendations"."modifyrecommendationdetail"."targetinstances"[1]."resourcedetails"."ec2resourcedetails"."instancetype"
-                            ELSE ''
-                        END)                                                                                     AS "recommended_instance_type_1"
-                    , CAST("recommendations"."currentinstance"."monthlycost" AS double)                         AS "current_monthly_cost"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[1]."estimatedmonthlycost" AS double)
-                            ELSE 0.0
-                        END)                                                                                     AS "estimated_monthly_cost_type_1"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[1]."estimatedmonthlysavings" AS double)
-                            ELSE CAST("recommendations"."currentinstance"."monthlycost" AS double)
-                        END)                                                                                     AS "estimated_monthly_savings_type_1"
-                      , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify')
-                                THEN "recommendations"."modifyrecommendationdetail"."targetinstances"[2]."resourcedetails"."ec2resourcedetails"."instancetype"
-                            ELSE ''
-                        END)                                                                                     AS "recommended_instance_type_2"
-                    , CAST("recommendations"."currentinstance"."monthlycost" AS double)                         AS "current_monthly_cost"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[2]."estimatedmonthlycost" AS double)
-                            ELSE 0.0
-                        END)                                                                                     AS "estimated_monthly_cost_type_2"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[2]."estimatedmonthlysavings" AS double)
-                            ELSE CAST("recommendations"."currentinstance"."monthlycost" AS double)
-                        END)                                                                                     AS "estimated_monthly_savings_type_2"
-                , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify')
-                                THEN "recommendations"."modifyrecommendationdetail"."targetinstances"[3]."resourcedetails"."ec2resourcedetails"."instancetype"
-                            ELSE ''
-                        END)                                                                                     AS "recommended_instance_type_3"
-                    , CAST("recommendations"."currentinstance"."monthlycost" AS double)                         AS "current_monthly_cost"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[3]."estimatedmonthlycost" AS double)
-                            ELSE 0.0
-                        END)                                                                                     AS "estimated_monthly_cost_type_3"
-                    , Try(CASE WHEN ("recommendations"."rightsizingtype" = 'Modify') THEN CAST(
-                "recommendations"."modifyrecommendationdetail"."targetinstances"[3]."estimatedmonthlysavings" AS double)
-                            ELSE CAST("recommendations"."currentinstance"."monthlycost" AS double)
-                        END)                                                                                     AS "estimated_monthly_savings_type_3"
-                FROM data
-            )
-        SELECT recs.*
-            , rightsizing_dates.earliest_date
-            , rightsizing_dates.latest_date
-            , rightsizing_dates.frequency
-            , chosen_tags.name
-        FROM recs
-            JOIN      rightsizing_dates ON ("rightsizing_dates"."instance_id" = "recs"."instance_id")
-            LEFT JOIN chosen_tags ON ("chosen_tags"."instance_id" = "recs"."instance_id")
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Weekly Notification Event for lambda data
-      Name: !Sub "${CFDataName}-Weekly-Scheduler"
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-              - LambdaFunction
-              - Arn
-          Id: WeeklyTriggerForEBSUtilization
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName:  
-          Fn::GetAtt:
-              - LambdaFunction
-              - Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-ecs-chargeback.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-ecs-chargeback.yaml
deleted file mode 100644
index e7acf66f9..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-ecs-chargeback.yaml
+++ /dev/null
@@ -1,308 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Collects ECS Cluster and service data and places into a bucket in the management account
-Parameters:
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to that will be created by the management template
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: 'ecs-chargeback'
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to hold lambada information
-    Default: optimization_data
-  CURTable:
-    Type: String
-    Description: The name of your Cost and Usage Report table in Athena
-    Default: cid_cur.cur
-  GlueRoleArn:
-    Type: String
-    Description: ARN of the IAM role deployed to use for glue.
-  CodeBucket:
-    Type: String
-    Description: S3 Bucket that exists and holds code
-    Default: aws-well-architected-labs
-  CodeKey:
-    Type: String
-    Description: file name of ZipFile with data code
-    Default: Cost/Labs/300_Optimization_Data_Collection/ecs.zip
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-  LambdaFunctionARN:
-    Description: ARN for lambda function which account id wil be passed too
-    Value:
-      Fn::GetAtt:
-        - LambdaFunction
-        - Arn
-  SQSUrl:
-    Description: TaskQueue URL the account collector lambda
-    Value: !Ref TaskQueue
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${MultiAccountRoleName}" # Need to assume a Read role in all Accounts
-        - PolicyName: !Sub "${CFDataName}-permissions"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "sqs:ReceiveMessage"
-                  - "sqs:DeleteMessage"
-                  - "sqs:GetQueueAttributes"
-                Resource: 
-                  - !Sub "arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:EcsChargebackModule-TaskQueue"
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                - "ecs:ListAttributes"
-                - "ecs:DescribeTaskSets"
-                - "ecs:DescribeTaskDefinition"
-                - "ecs:DescribeClusters"
-                - "ecs:ListServices"
-                - "ecs:ListAccountSettings"
-                - "ecs:DescribeCapacityProviders"
-                - "ecs:ListTagsForResource"
-                - "ecs:ListTasks"
-                - "ecs:ListTaskDefinitionFamilies"
-                - "ecs:DescribeServices"
-                - "ecs:ListContainerInstances"
-                - "ecs:DescribeContainerInstances"
-                - "ecs:DescribeTasks"
-                - "ecs:ListTaskDefinitions"
-                - "ecs:ListClusters"
-                Resource: !Sub "arn:aws:ecs:${AWS::Region}:${AWS::AccountId}:*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${Crawler}"
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Code:
-        S3Key: !Ref CodeKey
-        S3Bucket: !Ref CodeBucket 
-      Handler: 'ecs.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME:
-            Ref: DestinationBucket
-          PREFIX:
-            Ref: CFDataName
-          ROLENAME : !Ref MultiAccountRoleName
-          CRAWLER_NAME:
-            Ref: Crawler
-  Crawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-          - '${CFDataName}-Crawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleArn
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/${CFDataName}-data/"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: sqs.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt TaskQueue.Arn
-  TaskQueue:
-    Type: AWS::SQS::Queue
-    Properties:
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      KmsMasterKeyId: "alias/aws/sqs"
-      QueueName: 'EcsChargebackModule-TaskQueue'
-  EventSourceMapping:
-    DependsOn:
-      - EventPermission
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      EventSourceArn: !GetAtt TaskQueue.Arn
-      FunctionName: !GetAtt LambdaFunction.Arn
-  AthenaClusterMetadataView:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: ecs_chargeback_cluster_metadata_view
-      QueryString: |
-          CREATE OR REPLACE VIEW ecs_chargeback_cluster_metadata_view AS 
-          SELECT
-            *
-          , "tag"."value"
-          FROM
-            ( ecs_chargeback_ecs_services_clusters_data
-              CROSS JOIN UNNEST("tags") t (tag)
-            )
-          WHERE ("tag"."key" = 'BU')
-  AthenaEc2ClusterCostsView:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: ecs_chargeback_ec2_cluster_costs
-      QueryString: !Sub |
-        CREATE OR REPLACE VIEW ecs_chargeback_ec2_cluster_costs AS
-        SELECT
-          line_item_product_code
-        , line_item_usage_account_id
-        , line_item_resource_id
-        , line_item_usage_type
-        , sum((CASE WHEN (line_item_line_item_type = 'SavingsPlanCoveredUsage') THEN line_item_usage_amount WHEN (line_item_line_item_type = 'DiscountedUsage') THEN line_item_usage_amount WHEN (line_item_line_item_type = 'Usage') THEN line_item_usage_amount ELSE 0 END)) sum_line_item_usage_amount
-        , sum(line_item_unblended_cost) unblended_cost
-        , sum((CASE WHEN (line_item_line_item_type = 'SavingsPlanCoveredUsage') THEN savings_plan_savings_plan_effective_cost WHEN (line_item_line_item_type = 'SavingsPlanRecurringFee') THEN (savings_plan_total_commitment_to_date - savings_plan_used_commitment) WHEN (line_item_line_item_type = 'SavingsPlanNegation') THEN 0 WHEN (line_item_line_item_type = 'SavingsPlanUpfrontFee') THEN 0 WHEN (line_item_line_item_type = 'DiscountedUsage') THEN reservation_effective_cost WHEN (line_item_line_item_type = 'RIFee') THEN (reservation_unused_amortized_upfront_fee_for_billing_period + reservation_unused_recurring_fee) ELSE line_item_unblended_cost END)) sum_line_item_amortized_cost
-        , month
-        , year
-        FROM
-          ${CURTable}
-        WHERE (((product_product_name = 'Amazon Elastic Compute Cloud') AND ((resource_tags_user_name LIKE '%ECS%') OR (resource_tags_user_name LIKE '%ecs%'))) AND (((line_item_usage_type LIKE '%BoxUsage%') OR (line_item_usage_type LIKE '%Spot%')) OR (line_item_usage_type LIKE '%%EBS%%Volume%%')))
-        GROUP BY resource_tags_user_name, line_item_product_code, line_item_usage_account_id, line_item_resource_id, line_item_usage_type, month, year
-  AthenaBUUsageView:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: ecs_chargeback_bu_usage
-      QueryString: !Sub |
-        CREATE OR REPLACE VIEW ecs_chargeback_bu_usage AS 
-        SELECT
-          "bill_payer_account_id"
-        , "line_item_product_code"
-        , "line_item_usage_account_id"
-        , "line_item_resource_id"
-        , "task"
-        , "resource_tags_aws_ecs_service_Name"
-        , "line_item_usage_type"
-        , "line_item_operation"
-        , "sum"(CAST("sum_line_item_usage_amount" AS double)) "sum_line_item_usage_amount"
-        , "cur"."month"
-        , "cur"."year"
-        , "cluster"
-        , "services"
-        , "servicearn"
-        , "account_id"
-        , "value"
-        FROM
-          ((
-          SELECT
-            "bill_payer_account_id"
-          , "line_item_product_code"
-          , "line_item_usage_account_id"
-          , "line_item_resource_id"
-          , "split"("line_item_resource_id", '/')[2] "task"
-          , "resource_tags_aws_ecs_service_Name"
-          , "line_item_usage_type"
-          , "line_item_operation"
-          , "sum"(CAST("line_item_usage_amount" AS double)) "sum_line_item_usage_amount"
-          , "month"
-          , "year"
-          FROM
-            ${CURTable}
-          WHERE ((("line_item_operation" = 'ECSTask-EC2') AND ("line_item_product_code" IN ('AmazonECS'))) AND ("line_item_usage_type" LIKE '%GB%'))
-          GROUP BY "bill_payer_account_id", "line_item_usage_account_id", "line_item_product_code", "line_item_operation", "line_item_resource_id", "resource_tags_aws_ecs_service_Name", "line_item_usage_type", "line_item_operation", "month", "year"
-        )  cur
-        LEFT JOIN (
-          SELECT
-            "cluster"
-          , "services"
-          , "servicearn"
-          , "value"
-          , "year"
-          , "month"
-          , "account_id"
-          FROM
-            ecs_chargeback_cluster_metadata_view
-        )  clusters_data ON ((("clusters_data"."account_id" = "cur"."line_item_usage_account_id") AND (("clusters_data"."services" = "cur"."resource_tags_aws_ecs_service_name") AND ("clusters_data"."year" = "cur"."year"))) AND ("clusters_data"."month" = "cur"."month")))
-        GROUP BY "bill_payer_account_id", "line_item_usage_account_id", "line_item_product_code", "line_item_operation", "line_item_resource_id", "resource_tags_aws_ecs_service_Name", "line_item_usage_type", "line_item_operation", "cur"."month", "cur"."year", "cluster", "services", "servicearn", "value", "task", "account_id"
-  AthenaEC2CChargeBackQuery:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: ecs_chargeback_report
-      QueryString: |
-        SELECT ecs_chargeback_bu_usage.line_item_usage_account_id, sum(sum_line_item_usage_amount) AS task_usage, total_usage, (sum(sum_line_item_usage_amount)/total_usage) as percent,  ec2_cost, ((sum(sum_line_item_usage_amount)/total_usage)*ec2_cost) as ecs_cost,
-          "cluster",
-          services,
-          servicearn,
-          value,
-          ecs_chargeback_bu_usage.month,
-          ecs_chargeback_bu_usage.year
-        FROM "ecs_chargeback_bu_usage"
-        LEFT JOIN (select line_item_usage_account_id, sum(sum_line_item_usage_amount) as total_usage, year, month from "ecs_chargeback_bu_usage" where "cluster" <> '' group by line_item_usage_account_id, year, month) sum
-        on sum.line_item_usage_account_id = ecs_chargeback_bu_usage.line_item_usage_account_id
-        and sum.month=ecs_chargeback_bu_usage.month
-        and sum.year=ecs_chargeback_bu_usage.year
-        LEFT JOIN
-        (SELECT line_item_usage_account_id, month, year, sum(sum_line_item_amortized_cost) as ec2_cost FROM "ec2_cluster_costs_view" group by  line_item_usage_account_id,month,year) ec2_cost
-        on ec2_cost.month=ecs_chargeback_bu_usage.month
-        and ec2_cost.year=ecs_chargeback_bu_usage.year
-        and ec2_cost.line_item_usage_account_id=ecs_chargeback_bu_usage.line_item_usage_account_id
-        WHERE "cluster" <> ''  and  if((date_format(current_timestamp , '%M') = 'January'),ecs_chargeback_bu_usage.month = '12', ecs_chargeback_bu_usage.month = CAST((month(now())-1) AS VARCHAR) )
-        and  if((date_format(current_timestamp , '%M') = 'January'), ecs_chargeback_bu_usage.year = CAST((year(now())-1) AS VARCHAR) ,ecs_chargeback_bu_usage.year = CAST(year(now()) AS VARCHAR))
-        GROUP BY  "cluster", services, servicearn, value, ecs_chargeback_bu_usage.month, ecs_chargeback_bu_usage.year, ecs_chargeback_bu_usage.line_item_usage_account_id, total_usage, ec2_cost
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-inventory.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-inventory.yaml
deleted file mode 100644
index c00c9aca1..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-inventory.yaml
+++ /dev/null
@@ -1,596 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves Inventory data for the chosen service
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to be created to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: inventory
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  CodeBucket:
-      Type: String
-      Description: S3 Bucket that exists and holds code
-      Default: aws-well-architected-labs
-  CodeKey:
-    Type: String
-    Description: file name of ZipFile with data code
-    Default: Cost/Labs/300_Optimization_Data_Collection/fof.zip
-  GlueRoleARN:
-    Type: String
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-Outputs:
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-  GlueCrawler:
-    Value:
-      Fn::Sub: "${CFDataName}Crawler"
-  SQSUrl:
-    Description: TaskQueue URL the account collector lambda
-    Value: !Ref TaskQueue
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${MultiAccountRoleName}" # Need to assume a Read role in all Accounts
-        - PolicyName: !Sub "${CFDataName}-S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: "*"
-              - Effect: "Allow"
-                Action:
-                  - "lambda:InvokeFunction"
-                Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:pricing-Lambda-Function"
-              - Effect: "Allow"
-                Action:
-                  - "sqs:ReceiveMessage"
-                  - "sqs:DeleteMessage"
-                  - "sqs:GetQueueAttributes"
-                Resource: arn:aws:sqs:*:*:InventoryCollectorModul-TaskQueue
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Code:
-         S3Bucket: !Ref CodeBucket
-         S3Key: !Ref CodeKey
-      Handler: 'main.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME:
-            Ref: DestinationBucket
-          ROLENAME:
-            Ref: MultiAccountRoleName
-          PREFIX:
-            Ref: CFDataName
-          AMICrawler:
-            Ref: AMICrawler
-          SnapshotCrawler:
-            Ref: SnapshotCrawler
-          EBSCrawler:
-            Ref: EBSCrawler
-  AMICrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name:
-        !Sub
-          - '${CFDataName}-AMICrawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/inventory/inventory-ami-data/"
-      Configuration: "{\"Version\":1.0,\"CrawlerOutput\":{\"Partitions\":{\"AddOrUpdateBehavior\":\"InheritFromTable\"}}}"
-  SnapshotCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name:
-        !Sub
-          - '${CFDataName}-SnapshotCrawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/inventory/inventory-snapshot-data/"
-      Configuration: "{\"Version\":1.0,\"CrawlerOutput\":{\"Partitions\":{\"AddOrUpdateBehavior\":\"InheritFromTable\"}}}"
-  EBSCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name:
-        !Sub
-          - '${CFDataName}-EBSCrawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/inventory/inventory-ebs-data/"
-      Configuration: "{\"Version\":1.0,\"CrawlerOutput\":{\"Partitions\":{\"AddOrUpdateBehavior\":\"InheritFromTable\"}}}"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: sqs.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt TaskQueue.Arn
-  TaskQueue: 
-    Type: AWS::SQS::Queue
-    Properties: 
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      KmsMasterKeyId: "alias/aws/sqs"
-      QueueName: 'InventoryCollectorModul-TaskQueue'
-  EventSourceMapping:
-    DependsOn:
-      - EventPermission
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      EventSourceArn: !GetAtt TaskQueue.Arn
-      FunctionName: !GetAtt LambdaFunction.Arn
-  AthenaSnaphotAMI:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies snapshots connected to AMI's
-      Name: inventory_snapshot_connected_to_ami
-      QueryString: |
-        SELECT distinct(snapshotid),volume,volumesize,starttime,snapdescription, ownerid, 
-        snap_ami_id, imageid, name, description, state, rootdevicetype, virtualizationtype,year, month, 
-        CASE
-        WHEN snap_ami_id = imageid THEN 'AMI Avalible'
-        WHEN snap_ami_id LIKE 'ami%' THEN 'AMI Removed'
-        ELSE 'Not AMI'
-        END AS status
-          FROM ( 
-        (SELECT snapshotid,
-            volumeid as volume,
-            volumesize,
-            starttime,
-            Description AS snapdescription,
-            year,
-            month,
-            ownerid,
-            
-            CASE
-            WHEN substr(Description, 1, 22) = 'Created by CreateImage' THEN
-            split_part(Description,' ', 5)
-            WHEN substr(Description, 2, 11) = 'Copied snap' THEN
-            split_part(Description,' ', 9)
-            WHEN substr(Description, 1, 22) = 'Copied for Destination' THEN
-            split_part(Description,' ', 4)
-            ELSE ''
-            END AS snap_ami_id
-        FROM optimization_data.inventory_snapshot_data
-        ) AS snapshots
-        LEFT JOIN 
-            (SELECT imageid,
-            name,
-            description,
-            state,
-            rootdevicetype,
-            virtualizationtype
-            FROM optimization_data.inventory_ami_data) AS ami
-                ON snapshots.snap_ami_id = ami.imageid )
-  AthenaSnaphotAMICUR:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies snapshots connected to AMI's with CUR data 
-      Name: inventory_snapshot_connected_to_ami_with_CUR
-      QueryString: | 
-          SELECT DISTINCT
-            snapshotid
-          , volume
-          , volumesize
-          , starttime
-          , snapdescription
-          , ownerid
-          , snap_ami_id
-          , imageid
-          , name
-          , description
-          , state
-          , rootdevicetype
-          , virtualizationtype
-          , snapshots.year
-          , snapshots.month
-          , (CASE WHEN (snap_ami_id = imageid) THEN 'AMI Avalible' WHEN (snap_ami_id LIKE 'ami%') THEN 'AMI Removed' ELSE 'Not AMI' END) status
-          ,sum_line_item_usage_amount
-          ,sum_line_item_unblended_cost
-          FROM
-          (SELECT
-              snapshotid
-            , volumeid volume
-            , volumesize
-            , starttime
-            , Description snapdescription
-            , inventory_snapshot_data.year
-            , inventory_snapshot_data.month
-            , ownerid
-            , (CASE WHEN ("substr"(Description, 1, 22) = 'Created by CreateImage') THEN "split_part"(Description, ' ', 5) WHEN ("substr"(Description, 2, 11) = 'Copied snap') THEN "split_part"(Description, ' ', 9) WHEN ("substr"(Description, 1, 22) = 'Copied for Destination') THEN "split_part"(Description, ' ', 4) ELSE '' END) snap_ami_id
-            FROM
-              optimization_data.inventory_snapshot_data)
-          as   snapshots
-          LEFT JOIN (
-            SELECT
-              imageid
-            , name
-            , description
-            , state
-            , rootdevicetype
-            , virtualizationtype
-            FROM
-              optimization_data.inventory_ami_data
-          )  ami ON (snapshots.snap_ami_id = ami.imageid)
-          left join
-          (SELECT
-                bill_payer_account_id,
-                line_item_usage_account_id,
-                product_region,
-                split("line_item_resource_id", '/')[2]resource_id,
-                ${table_name}.month, 
-                ${table_name}.year,
-                SUM(CAST(line_item_usage_amount AS DOUBLE)) AS sum_line_item_usage_amount,
-                SUM(CAST(line_item_unblended_cost AS DECIMAL(16,8))) AS sum_line_item_unblended_cost
-              FROM
-                ${database}.${table_name}
-              WHERE
-                ${date_filter}
-                AND product_product_name = 'Amazon Elastic Compute Cloud'
-                AND line_item_usage_type LIKE '%%EBS%%Snapshot%%'
-                AND product_product_family LIKE 'Storage Snapshot'
-                AND line_item_line_item_type  IN ('DiscountedUsage', 'Usage', 'SavingsPlanCoveredUsage')
-              GROUP BY
-                bill_payer_account_id,
-                line_item_usage_account_id,
-                product_region, 
-                "line_item_resource_id",month, year
-              ORDER BY
-                sum_line_item_unblended_cost DESC, 
-                sum_line_item_usage_amount DESC
-          ) as cur
-          on snapshots.snapshotid = cur.resource_id
-          and snapshots.ownerid=cur.line_item_usage_account_id
-          and snapshots.month=cur.month
-          and snapshots.year=cur.year
-          where snapshots.month = '11' and snapshots.year= '2022'
-
-  AthenaSnaphotAMIPricing:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies snapshots connected to AMI's with Pricing data 
-      Name: inventory_snapshot_connected_to_ami_with_pricing
-      QueryString: |
-        CREATE OR REPLACE VIEW snapshot_ami_quicksight_view AS 
-        SELECT *,
-          CASE
-            WHEN snap_ami_id = imageid THEN 'AMI Avalible'
-            WHEN snap_ami_id LIKE 'ami%' THEN 'AMI Removed' ELSE 'Not AMI'
-          END AS status,
-         cast(priceperunit as decimal)*volumesize as est_snap_cost
-        FROM ((((
-            (
-              SELECT snapshotid AS snap_id,
-                volumeid as volume,
-                volumesize,
-                starttime,
-                Description AS snapdescription,
-                year,
-                month,
-                region,
-                ownerid,
-                CASE
-                  WHEN substr(Description, 1, 22) = 'Created by CreateImage' THEN split_part(Description, ' ', 5)
-                  WHEN substr(Description, 2, 11) = 'Copied snap' THEN split_part(Description, ' ', 9)
-                  WHEN substr(Description, 1, 22) = 'Copied for Destination' THEN split_part(Description, ' ', 4) ELSE ''
-                END AS snap_ami_id
-              FROM optimization_data.inventory_snapshot_data
-            ) AS snapshots
-            LEFT JOIN (
-              SELECT imageid,
-                name,
-                description,
-                state,
-                rootdevicetype,
-                virtualizationtype, 
-                month as ami_month, 
-                year as ami_year
-              FROM optimization_data.inventory_ami_data) AS ami 
-            ON snapshots.snap_ami_id = ami.imageid and snapshots.month=ami.ami_month and snapshots.year = ami.ami_year
-          )
-          LEFT JOIN (
-          SELECT
-            region region_code
-          , regionname
-          FROM
-            optimization_data.pricing_region_names
-        )  region ON (snapshots.region = region.region_code))
-        LEFT JOIN (
-          SELECT DISTINCT
-            volumeid volume_mapping
-          , count(DISTINCT snapshotid) snap_count
-          FROM
-            optimization_data.inventory_snapshot_data
-          GROUP BY 1
-        )  mapping ON (mapping.volume_mapping = snapshots.volume)) s
-        LEFT JOIN (
-          SELECT
-            "productfamily"
-          , location
-          , priceperunit
-          , unit
-          FROM
-            optimization_data.pricing_ec2
-          WHERE ((("productfamily" = 'Storage Snapshot') AND (usagetype LIKE '%SnapshotUsage%')) AND ("locationtype" = 'AWS Region'))
-        )  snap_unit_price ON (s.regionname = snap_unit_price.location))
-
-  AthenaEBSTA:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies snapshots connected to AMI's with Pricing data 
-      Name: inventory_ebs_with_ta_data
-      QueryString: |
-        SELECT * 
-        FROM optimization_data.inventory_ebs_data
-        LEFT JOIN (
-          SELECT "volume id","volume name", "volume type","volume size",status,	"monthly storage cost" ,accountid as taaccountid, category, region as taregion, year as tayear,month as tamonth
-          FROM optimization_data.trusted_advisor_data
-          WHERE category = 'cost_optimizing' ) ta
-          ON inventory_ebs_data.volumeid = ta."volume id" and inventory_ebs_data.year = ta.tayear and inventory_ebs_data.month = ta.tamonth
-        LEFT JOIN (
-          SELECT
-            region region_code
-          , regionname
-          FROM optimization_data.pricing_region_names
-          )  region
-          ON (inventory_ebs_data.region = region.region_code)
-  AthenaEBSView:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies snapshots connected to AMI's with Pricing data
-      Name: ebs-view
-      QueryString: |
-        CREATE OR REPLACE VIEW inventory_ebs_view AS
-        SELECT * FROM
-                    optimization_data.inventory_ebs_data
-                LEFT JOIN
-                (select "volume id","volume name", "volume type","volume size",	"monthly storage cost" ,accountid as ta_accountid, status, category, region as ta_region, year as ta_year ,month as ta_month
-                from
-                optimization_data.trusted_advisor_data
-                where category = 'cost_optimizing') ta
-                ON inventory_ebs_data.volumeid = ta."volume id" and inventory_ebs_data.year = ta.ta_year and inventory_ebs_data.month = ta.ta_month
-                LEFT JOIN (
-          SELECT
-            "region" "region_code"
-          , regionname
-          FROM
-            optimization_data.pricing_region_names
-        )  region ON (inventory_ebs_data.region = region.region_code)
-  AthenaEBSTAPricing:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies snapshots connected to AMI's with Pricing data 
-      Name: inventory_ebs_with_ta_data_with_pricing
-      QueryString: |
-        CREATE OR REPLACE VIEW ebs_quicksight_view AS
-          SELECT
-            volumeid
-          , volumetype
-          , size
-          , attachments
-          , iops
-          , region
-          , accountid
-          , TRY(date_parse(createtime, '%Y-%m-%d %H:%i:%s')) date_created
-          , year
-          , month
-          , CAST(concat(year, '-', month, '-01') AS date) billing_period
-          , concat(year, '-', month) date
-          , (CASE status WHEN 'warning' THEN 'Underutilised' ELSE 'Healthy' END) status
-          , priceperunit
-          , iop_price
-          , (priceperunit * size) ebs_gb_cost
-          , (priceperunit * size) ebs_cost
-          , (CASE WHEN (volumetype = 'io1') THEN (iop_price * CAST(iops AS integer)) WHEN (volumetype = 'io2') THEN (iop_price * CAST(iops AS integer)) ELSE 0 END) iop_cost
-          FROM
-            ((optimization_data.inventory_ebs_view
-          LEFT JOIN (
-            SELECT
-              "volume api name"
-            , location
-            , priceperunit
-            , unit
-            , "product family"
-            FROM
-              optimization_data.pricing_ec2
-            WHERE ("product family" = 'Storage')
-          )  ebs_price ON ((inventory_ebs_view.volumetype = ebs_price."volume api name") AND (inventory_ebs_view.regionname = ebs_price.location)))
-          LEFT JOIN (
-            SELECT
-              "volume api name"
-            , location
-            , priceperunit iop_price
-            , unit
-            , "product family"
-            , usagetype
-            FROM
-              optimization_data.pricing_ec2
-            WHERE ((("Product Family" = 'System Operation') AND ("volume api name" IN ('io1', 'io2'))) AND ((usagetype LIKE '%EBS:VolumeP-IOPS.io2') OR (usagetype LIKE '%EBS:VolumeP-IOPS.piops')))
-          )  ebs_iops_price ON ((inventory_ebs_view.volumetype = ebs_iops_price."volume api name") AND (inventory_ebs_view.regionname = ebs_iops_price.location)))
-          ORDER BY volumeid DESC
-  AthenaGp3Opportunity:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Identifies gp2, io1, io2 that could move to gp3
-      Name: gp3-opportunity
-      QueryString: |
-        WITH raw_ebs_pricedata AS (
-        SELECT
-            region,
-            map_agg(
-                CASE WHEN "volume api name" = 'io1' AND unit = 'GB-Mo' THEN 'io1_GB-Mo'
-                    WHEN "volume api name" = 'io2' AND unit = 'GB-month' THEN 'io2_GB-Mo'
-                    WHEN "volume api name" = 'gp3' AND unit = 'GB-Mo' THEN 'gp3_GB-Mo'
-                    WHEN "volume api name" = 'gp2' AND unit = 'GB-Mo' THEN 'gp2_GB-Mo'
-                    WHEN "volume api name" = 'io1' AND unit = 'IOPS-Mo' THEN 'io1_IOPS-Mo'
-                    WHEN "volume api name" = 'io2' AND unit = 'IOPS-Mo' AND "group" = 'EBS IOPS' THEN 'io2_IOPS-Mo_tier1'
-                    WHEN "volume api name" = 'io2' AND unit = 'IOPS-Mo' AND "group" = 'EBS IOPS Tier 2' THEN 'io2_IOPS-Mo_tier2'
-                    WHEN "volume api name" = 'io2' AND unit = 'IOPS-Mo' AND "group" = 'EBS IOPS Tier 3' THEN 'io2_IOPS-Mo_tier3'
-                    WHEN "volume api name" = 'gp3' AND unit = 'IOPS-Mo' THEN 'gp3_IOPS-Mo'
-                    WHEN "volume api name" = 'gp3' AND unit = 'GiBps-mo' THEN 'gp3_GiBps-mo'
-                    ELSE unit
-                END, priceperunit) kv1
-        FROM optimization_data.pricing_ec2
-        JOIN optimization_data.pricing_region_names ON pricing_region_names.regionname = pricing_ec2.location
-        WHERE "volume api name" IN ('io1','io2','gp3','gp2')
-        GROUP BY region
-        ),
-        pivoted_ebs_pricedata AS (
-            SELECT region,
-                  kv1['io1_GB-Mo'] as io1_gb_unit_cost,
-                  kv1['io2_GB-Mo'] as io2_gb_unit_cost,
-                  kv1['gp2_GB-Mo'] as gp2_gb_unit_cost,
-                  kv1['gp3_GB-Mo'] AS gp3_gb_unit_cost,
-                  kv1['io1_IOPS-Mo'] as io1_iops_unit_cost,
-                  kv1['io2_IOPS-Mo_tier1'] as io2_iops_t1_unit_cost,
-                  kv1['io2_IOPS-Mo_tier2'] as io2_iops_t2_unit_cost,
-                  kv1['io2_IOPS-Mo_tier3'] as io2_iops_t3_unit_cost,
-                  kv1['gp3_IOPS-Mo'] as gp3_iops_unit_cost,
-                  kv1['gp3_GiBps-mo']/1000. AS gp3_throughput_unit_cost
-            FROM raw_ebs_pricedata
-        ),
-        ebs_data AS (
-            SELECT
-                volumeid,
-                "volume name",
-                "volume type",
-                size,
-                attachments,
-                iops,
-                inventory_ebs_view.region,
-                accountid,
-                year,
-                month,
-                CASE status
-                    WHEN 'warning' THEN 'Underutilised'
-                    ELSE 'Healthy'
-                END AS status,
-                CASE
-                    WHEN volumetype = 'io1' THEN io1_gb_unit_cost
-                    WHEN volumetype = 'io2' THEN io2_gb_unit_cost
-                    WHEN volumetype = 'gp2' THEN gp2_gb_unit_cost
-                END as gb_unit_cost,
-                CASE
-                    WHEN volumetype = 'io1' THEN io1_gb_unit_cost * size
-                    WHEN volumetype = 'io2' THEN io2_gb_unit_cost * size
-                    WHEN volumetype = 'gp2' THEN gp2_gb_unit_cost * size
-                END as current_gb_cost,
-                CASE
-                    WHEN volumetype = 'io1' THEN io1_iops_unit_cost
-                    WHEN volumetype = 'io2' THEN io2_iops_t1_unit_cost
-                    WHEN volumetype = 'gp2' THEN 0.0
-                END as iops_unit_cost,
-                CASE
-                    WHEN volumetype = 'io1' THEN io1_iops_unit_cost * CAST(iops AS double)
-                    WHEN volumetype = 'io2' THEN io2_iops_t1_unit_cost * CAST(iops AS double)
-                    WHEN volumetype = 'gp2' THEN 0.0
-                END as current_iops_cost,
-                gp3_gb_unit_cost,
-                gp3_gb_unit_cost * size AS gp3_gb_cost,
-                gp3_iops_unit_cost,
-                CASE
-                    WHEN cast(iops as integer) <= 3000 THEN 0.0
-                    ELSE (CAST(iops AS double) - 3000.) * gp3_iops_unit_cost
-                END as gp3_iops_cost,
-                gp3_throughput_unit_cost,
-                CASE
-                    WHEN volumetype = 'io1' THEN gp3_throughput_unit_cost * 500
-                    WHEN volumetype = 'io2' THEN gp3_throughput_unit_cost * 500
-                    WHEN volumetype = 'gp2' AND size <= 170 THEN gp3_throughput_unit_cost * (128.0 - 125.0)
-                    WHEN volumetype = 'gp2' AND size > 170 THEN gp3_throughput_unit_cost * (250.0 - 125.0)
-                END AS gp3_throughput_cost
-            FROM optimization_data.inventory_ebs_view
-            LEFT JOIN pivoted_ebs_pricedata ON pivoted_ebs_pricedata.region = inventory_ebs_view.region            
-            WHERE 
-                volumetype in('io1', 'io2', 'gp2')
-                and cast(iops as integer) < 16000 )
-          SELECT
-              *,
-              current_gb_cost + current_iops_cost AS current_total_cost,
-              gp3_gb_cost + gp3_iops_cost + gp3_throughput_cost AS gp3_total_cost,
-              (current_gb_cost + current_iops_cost) - (gp3_gb_cost + gp3_iops_cost + gp3_throughput_cost) as gp3_saving
-          FROM inventory_ebs_data
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-organization.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-organization.yaml
deleted file mode 100644
index 7b1173d66..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-organization.yaml
+++ /dev/null
@@ -1,302 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Lambda to collect Org data and store in S3 
-Parameters:
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that is created to hold org data
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  ManagementRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed in the management account which can retrieve AWS Organization data. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT
-  ManagementAccountID:
-    Type: String
-    AllowedPattern: ([a-z0-9\-, ]*?$)
-    Description: "(Ex: 123456789,098654321,789054312) List of Payer IDs you wish to collect data for. Can just be one Accounts"
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: organization
-  DatabaseName:
-    Type: String
-    Description: Athena Database name where you table will be created
-    Default: optimization_data
-  CURTable:
-    Type: String
-    Description: Athena Table with CUR
-    Default: cid_cur.cur
-  GlueRoleARN:
-    Type: String
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  Schedule:
-    Type: String
-    Description: Cron job to trigger the lambda using cloudwatch event
-    Default: "rate(14 days)"
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  LambdaFunctionName:
-    Value:
-      Ref: LambdaOrgData
-  LambdaFunctionARN:
-    Description: Lambda function ARN.
-    Value:
-      Fn::GetAtt:
-        - LambdaOrgData
-        - Arn
-Resources:
-  LambdaOrgData:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-        - 'Organization-Data-${Id}'
-        - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: Well Architected Lab - Collecting Accounts
-      Runtime: python3.8
-      Code:
-        ZipFile: |
-          #!/usr/bin/env python3
-          #Gets org data, grouped by ous and tags from management accounts in json
-          #Author Stephanie Gooch 2020
-          import boto3
-          import logging
-          from botocore.exceptions import ClientError
-          from botocore.client import Config
-          import os
-          import datetime
-          import json
-
-          bucket = os.environ["BUCKET_NAME"]
-          prefix = os.environ["PREFIX"]
-          crawler = os.environ["CRAWLER"]
-          MANAGEMENT_ACCOUNT_IDS = os.environ['MANAGEMENT_ACCOUNT_IDS']
-          role_name = os.environ['ROLE']
-
-          def timeconverter(o):
-              if isinstance(o, datetime.datetime):
-                  return o.__str__()
-              
-          def lambda_handler(event, context):
-              for payer_id in [r.strip() for r in MANAGEMENT_ACCOUNT_IDS.split(',')]:
-                  try:
-                      management_role_arn = f"arn:aws:iam::{payer_id}:role/{role_name}"
-                      sts_connection = boto3.client('sts')
-                      acct_b = sts_connection.assume_role(
-                          RoleArn=management_role_arn,
-                          RoleSessionName="cross_acct_lambda"
-                      )
-                      ACCESS_KEY = acct_b['Credentials']['AccessKeyId']
-                      SECRET_KEY = acct_b['Credentials']['SecretAccessKey']
-                      SESSION_TOKEN = acct_b['Credentials']['SessionToken']
-                      client = boto3.client(
-                          "organizations", region_name="us-east-1", #Using the Organizations client to get the data. This MUST be us-east-1 regardless of region you have the Lamda in
-                          aws_access_key_id=ACCESS_KEY, aws_secret_access_key=SECRET_KEY, aws_session_token=SESSION_TOKEN, )
-
-                      root_id    = client.list_roots()['Roots'][0]['Id']
-                      ou_id_list = get_ou_ids(root_id, client)
-                      with open('/tmp/ou-org.json', 'w') as f:
-                          for ou in ou_id_list.keys():
-                              account_data(f, ou, ou_id_list[ou][0], client, ou_id_list[ou][1])
-                      s3_upload('ou-org', payer_id)
-
-                      with open('/tmp/acc-org.json', 'w') as f:
-                          account_data(f, root_id, root_id, client,'')
-                      s3_upload('acc-org', payer_id)
-                      start_crawler(crawler)
-                  except Exception as e:
-                      # Send some context about this error to Lambda Logs
-                      logging.warning("%s" % e)
-                      continue 
-
-          def get_ou_ids(parent_id, client):
-              full_result = {}
-              test = []
-              ous = ou_loop(parent_id, test, client)
-              print(ous)
-              
-              for ou in ous:
-                  ou_info = client.describe_organizational_unit(OrganizationalUnitId=ou)
-                  full_result[ou]=[]
-                  full_result[ou].append(ou_info['OrganizationalUnit']['Name'])
-                  tags =list_tags(client, ou)
-                  full_result[ou].append(tags)
-              return full_result
-
-          def ou_loop(parent_id, test, client):
-              print(parent_id)
-              paginator = client.get_paginator('list_children')
-              iterator = paginator.paginate( ParentId=parent_id, ChildType='ORGANIZATIONAL_UNIT')
-              for page in iterator:
-                  for ou in page['Children']:
-                      test.append(ou['Id'])
-                      ou_loop(ou['Id'], test, client)
-              return test
-
-          def account_data(f, parent, parent_name, client, parent_tags):
-              account_id_list = get_acc_ids(parent, client)
-              for account_id in account_id_list:
-                  response = client.describe_account(AccountId=account_id)
-                  account  = response["Account"]          
-                  tags_list = list_tags(client, account["Id"])
-                  for org_tag in tags_list:
-                      tag = org_tag['Key']
-                      value = org_tag['Value']
-                      kv = {tag : value}
-                      account.update(kv)
-                  account.update({'Parent' : parent_name, 'Parent_Tags':parent_tags})        
-                  data = json.dumps(account, default = timeconverter) 
-                  f.write(data)
-                  f.write('\n')
-                  
-
-          def get_acc_ids(parent_id,  client):
-              full_result = []
-              paginator = client.get_paginator('list_accounts_for_parent')
-              iterator  = paginator.paginate(ParentId=parent_id)
-              for page in iterator:
-                  for acc in page['Accounts']:
-                      print(acc['Id'])
-                      full_result.append(acc['Id'])
-              return full_result
-
-          def list_tags(client, resource_id): 
-              tags = []
-              paginator = client.get_paginator("list_tags_for_resource")
-              response_iterator = paginator.paginate(ResourceId=resource_id)
-              for response in response_iterator:
-                  tags.extend(response['Tags'])
-              return tags
-
-          def s3_upload(file_name, payer_id):
-              try:
-                  s3 = boto3.client('s3', os.environ["REGION"],config=Config(s3={'addressing_style': 'path'}))
-                  s3.upload_file(f'/tmp/{file_name}.json', bucket, f"{prefix}/{prefix}-data/payer_id={payer_id}/{file_name}.json") 
-                  print(f"{file_name}org data in s3")
-              except Exception as e:
-                  print(e)
-
-          def start_crawler(crawler):
-              glue_client = boto3.client("glue")
-              try:
-                  glue_client.start_crawler(Name=crawler)
-                  print(f"{crawler} has been started")
-              except Exception as e:
-                  # Send some context about this error to Lambda Logs
-                  logging.warning("%s" % e)
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 600
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME: !Ref DestinationBucket
-          REGION: !Ref "AWS::Region"
-          CRAWLER: !Ref OrgCrawler
-          ROLE: !Ref ManagementRoleName
-          MANAGEMENT_ACCOUNT_IDS: !Ref ManagementAccountID
-          PREFIX: !Ref CFDataName
-  OrgCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name:  !Join
-          - '-'
-          - - !Ref CFDataName
-            - !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/${CFDataName}-data/"
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}AWS-Organization-Data-Execute-Lambda"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: "Assume-Management-Organization-Data-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${ManagementRoleName}" # Need to assume a Read role in all Management Accounts
-        - PolicyName: !Sub "S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: 
-                  - !Sub "arn:aws:s3:::${DestinationBucket}/*"
-        - PolicyName: "CloudWatch-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/Lambda_Organization_Data_Collector*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${OrgCrawler}"
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Monthly
-      Name: Monthly-Scheduler-For-Accounts
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-              - LambdaOrgData
-              - Arn
-          Id: WeeklyTriggerForGetAccounts
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaOrgData.Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-  AthenaQuery:
-      Type: AWS::Athena::NamedQuery
-      Properties:
-        Database: !Ref DatabaseName
-        Description: Provides a summary view of the budgets
-        Name: budgets_cur
-        QueryString: !Sub
-          CREATE OR REPLACE VIEW budgets_cur AS
-          SELECT *
-          FROM ("${CURTable}" cur
-          INNER JOIN "${DatabaseName}"."organization_data"
-            ON ("cur"."line_item_usage_account_id" = "${DatabaseName}"."organization_data"."id")) 
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-pricing.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-pricing.yaml
deleted file mode 100644
index 1d3c841f6..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-pricing.yaml
+++ /dev/null
@@ -1,491 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves Pricing data
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  CodeBucket:
-    Type: String
-    Description: S3 Bucket that exists and holds code
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: pricing
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  Schedule:
-    Type: String
-    Default: "cron(30 12 L * ? *)"
-    Description: Cloud watch event Schedule to trigger the lambda 
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "${CFDataName}-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:ListBucket"
-                  - "s3:GetBucketLocation"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: "arn:aws:logs:*:*:*"
-  EC2LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Architectures: [arm64]
-      Code:
-        ZipFile: |
-          #Author Stephanie Gooch 2021
-          # Function to download EC2 pricing
-          # Please reachout to costoptimization@amazon.com if there's any comments or suggestions
-
-          import json
-          import boto3
-          import urllib3
-          import urllib.request
-          import os
-          import logging
-          CODE_BUCKET = os.environ['CODE_BUCKET']
-
-          def lambda_handler(event, context):
-
-              s3=boto3.resource('s3')
-              http=urllib3.PoolManager()
-
-              url = 'https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonEC2/current/index.csv'
-              s3Bucket =  os.environ["BUCKET_NAME"]
-              key = f'{os.environ["DEST_PREFIX"]}/{os.environ["DEST_PREFIX"]}-ec2/ec2_prices.csv'
-
-              urllib.request.urlopen(url)   #Provide URL
-              s3.meta.client.upload_fileobj(http.request('GET', url, preload_content=False), s3Bucket, key)
-
-              region_data(s3Bucket, s3)
-
-              return {
-                  'statusCode': 200,
-                  'body': json.dumps('AmazonEC2 Pricing Complete')
-              }
-          def region_data(s3Bucket, s3):
-
-            #Create a Source Dictionary That Specifies Bucket Name and Key Name of the Object to Be Copied
-            copy_source = {
-                'Bucket': CODE_BUCKET,
-                'Key': 'Cost/Labs/300_Optimization_Data_Collection/Region/regions.csv'
-            }
-            
-            bucket = s3.Bucket(s3Bucket)
-            
-            bucket.copy(copy_source, 'pricing/pricing-region/regions.csv')
-            
-            # Printing the Information That the File Is Copied.
-            print('Single File is copied')
-
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2880
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME: !Ref DestinationBucket
-          CODE_BUCKET: !Ref CodeBucket
-          ACCOUNT_ID: AWS::AccountId
-          DEST_PREFIX: !Ref CFDataName
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Weekly Notification Event for lambda data
-      Name: !Sub "${CFDataName}-Weekly-Scheduler"
-      ScheduleExpression: !Ref Schedule
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-              - EC2LambdaFunction
-              - Arn
-          Id: WeeklyTriggerForEC2Pricing
-        - Arn:
-            Fn::GetAtt:
-              - RDSLambdaFunction
-              - Arn
-          Id: WeeklyTriggerForRDSPricing
-  EC2EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName:  
-          Fn::GetAtt:
-              - EC2LambdaFunction
-              - Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-  RDSEventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName:  
-          Fn::GetAtt:
-              - RDSLambdaFunction
-              - Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-  AthenaRegionTable:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view region data
-      Name: pricing_region_names
-      QueryString: !Sub |
-        CREATE EXTERNAL TABLE pricing_region_names(
-          region string,
-          regionname string,
-          endpoint string,
-          protocol string)
-        ROW FORMAT DELIMITED
-          FIELDS TERMINATED BY ','
-        STORED AS INPUTFORMAT
-          'org.apache.hadoop.mapred.TextInputFormat'
-        OUTPUTFORMAT
-          'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
-        LOCATION
-          's3://${DestinationBucket}/pricing/pricing-region'
-        TBLPROPERTIES (
-          'has_encrypted_data'='false',
-          'skip.header.line.count'='1')
-  AthenaEC2PricingTable:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: pricing_ec2_create_table
-      QueryString: !Sub |
-        CREATE EXTERNAL TABLE pricing_ec2(
-          sku string,
-          offertermcode string,
-          ratecode string,
-          termtype string,
-          pricedescription string,
-          effectivedate string,
-          startingrange string,
-          endingrange string,
-          unit string,
-          priceperunit string,
-          currency string,
-          relatesto string,
-          leasecontractlength string,
-          purchaseoption string,
-          offeringclass string,
-          productfamily string,
-          servicecode string,
-          location string,
-          locationtype string,
-          instancetype string,
-          currentgeneration string,
-          instancefamily string,
-          vcpu string,
-          physicalprocessor string,
-          clockspeed string,
-          memory string,
-          storage string,
-          networkperformance string,
-          processorarchitecture string,
-          storagemedia string,
-          volumetype string,
-          maxvolumesize string,
-          maxiopsvolume string,
-          maxiopsburstperformance string,
-          maxthroughputvolume string,
-          provisioned string,
-          tenancy string,
-          ebsoptimized string,
-          operatingsystem string,
-          licensemodel string,
-          groups string,
-          groupdescription string,
-          transfertype string,
-          fromlocation string,
-          fromlocationtype string,
-          tolocation string,
-          tolocationtype string,
-          usagetype string,
-          operation string,
-          abdinstanceclass string,
-          availabilityzone string,
-          capacitystatus string,
-          classicnetworkingsupport string,
-          dedicatedebsthroughput string,
-          ecu string,
-          elasticgraphicstype string,
-          enhancednetworkingsupported string,
-          fromregion string,
-          gpu string,
-          gpumemory string,
-          instance string,
-          instancecapacity10xlarge string,
-          instancecapacity12xlarge string,
-          instancecapacity16xlarge string,
-          instancecapacity18xlarge string,
-          instancecapacity24xlarge string,
-          instancecapacity2xlarge string,
-          instancecapacity32xlarge string,
-          instancecapacity4xlarge string,
-          instancecapacity8xlarge string,
-          instancecapacity9xlarge string,
-          instancecapacitylarge string,
-          instancecapacitymedium string,
-          instancecapacitymetal string,
-          instancecapacityxlarge string,
-          instancesku string,
-          intelavxavailable string,
-          intelavx2available string,
-          intelturboavailable string,
-          marketoption string,
-          normalizationsizefactor string,
-          physicalcores string,
-          preinstalledsw string,
-          processorfeatures string,
-          producttype string,
-          regioncode string,
-          resourcetype string,
-          servicename string,
-          snapshotarchivefeetype string,
-          toregioncode string,
-          volumeapiname string,
-          vpcnetworkingsupport string)
-        ROW FORMAT SERDE
-          'org.apache.hadoop.hive.serde2.OpenCSVSerde'
-        WITH SERDEPROPERTIES (
-          'escapeChar'='\\',
-          'quoteChar'='\"',
-          'separatorChar'=',')
-        STORED AS INPUTFORMAT
-          'org.apache.hadoop.mapred.TextInputFormat'
-        OUTPUTFORMAT
-          'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
-        LOCATION
-          's3://${DestinationBucket}/${CFDataName}/pricing-ec2'
-        TBLPROPERTIES (
-          'has_encrypted_data'='false',
-          'skip.header.line.count'='6'
-        )
-  RDSLambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-RDS-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve RDS ${CFDataName}"
-      Runtime: python3.8
-      Architectures: [arm64]
-      Code:
-        ZipFile: |
-          #Author Stephanie Gooch 2021
-          # Function to download RDS pricing
-          # Please reachout to costoptimization@amazon.com if there's any comments or suggestions
-
-          import json
-          import boto3
-          import urllib3
-          import urllib.request
-          import os
-          import logging
-
-          def lambda_handler(event, context):
-
-              s3=boto3.resource('s3')
-              http=urllib3.PoolManager()
-
-              url = 'https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonRDS/current/index.csv'
-              s3Bucket =  os.environ["BUCKET_NAME"]
-              key = f'{os.environ["DEST_PREFIX"]}/{os.environ["DEST_PREFIX"]}-rds/rds_prices.csv'
-
-              urllib.request.urlopen(url)   #Provide URL
-              s3.meta.client.upload_fileobj(http.request('GET', url, preload_content=False), s3Bucket, key)
-
-              graviton_data(s3Bucket, s3)
-              region_data(s3Bucket, s3)
-
-          def graviton_data(s3Bucket, s3):
-
-              #Create a Source Dictionary That Specifies Bucket Name and Key Name of the Object to Be Copied
-              copy_source = {
-                  'Bucket': 'aws-well-architected-labs',
-                  'Key': 'Cost/Labs/300_Optimization_Data_Collection/graviton/rds_graviton_mapping.csv'
-              }
-              
-              bucket = s3.Bucket(s3Bucket)
-              
-              bucket.copy(copy_source, 'pricing/graviton/rds_graviton_mapping.csv')
-              
-              # Printing the Information That the File Is Copied.
-              print('Single File is copied')
-          
-          def region_data(s3Bucket, s3):
-
-              #Create a Source Dictionary That Specifies Bucket Name and Key Name of the Object to Be Copied
-              copy_source = {
-                  'Bucket': 'aws-well-architected-labs',
-                  'Key': 'Cost/Labs/300_Optimization_Data_Collection/Region/regions.csv'
-              }
-              
-              bucket = s3.Bucket(s3Bucket)
-              
-              bucket.copy(copy_source, 'pricing/pricing-region/regions.csv')
-              
-              # Printing the Information That the File Is Copied.
-              print('Single File is copied')
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2880
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME:
-            !Ref DestinationBucket
-          ACCOUNT_ID: AWS::AccountId
-          DEST_PREFIX: !Ref CFDataName
-  AthenaRDSPricingTable:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: pricing_rds_creat_table
-      QueryString: !Sub |
-        CREATE EXTERNAL TABLE pricing_rds(
-          sku string,
-          offertermcode string,
-          ratecode string,
-          termtype string,
-          pricedescription string,
-          effectivedate string,
-          startingrange string,
-          endingrange string,
-          unit string,
-          priceperunit string,
-          currency string,
-          relatedto string,
-          leasecontractlength string,
-          purchaseoption string,
-          offeringclass string,
-          productfamily string,
-          servicecode string,
-          location string,
-          locationtype string,
-          instancetype string,
-          currentgeneration string,
-          instancefamily string,
-          vcpu string,
-          physicalprocessor string,
-          clockspeed string,
-          memory string,
-          storage string,
-          networkperformance string,
-          processorarchitecture string,
-          storagemedia string,
-          volumetype string,
-          minvolumesize string,
-          maxvolumesize string,
-          enginecode string,
-          databaseengine string,
-          databaseedition string,
-          licensemodel string,
-          deploymentoption string,
-          group string,
-          groupdescription string,
-          usagetype string,
-          operation string,
-          dedicatedebsthroughput string,
-          enhancednetworkingsupported string,
-          instancetypefamily string,
-          normalizationsizefactor string,
-          processorfeatures string,
-          servicename string)
-        ROW FORMAT SERDE
-          'org.apache.hadoop.hive.serde2.OpenCSVSerde'
-        WITH SERDEPROPERTIES (
-          'quoteChar'='\"',
-          'separatorChar'=',')
-        STORED AS INPUTFORMAT
-          'org.apache.hadoop.mapred.TextInputFormat'
-        OUTPUTFORMAT
-          'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
-        LOCATION
-          's3://${DestinationBucket}/${CFDataName}/${CFDataName}-rds'
-        TBLPROPERTIES (
-          'CrawlerSchemaDeserializerVersion'='1.0',
-          'CrawlerSchemaSerializerVersion'='1.0',
-          'UPDATED_BY_CRAWLER'='Pricing CSV',
-          'areColumnsQuoted'='true',
-          'averageRecordSize'='1061',
-          'classification'='csv',
-          'columnsOrdered'='true',
-          'compressionType'='none',
-          'delimiter'=',',
-          'objectCount'='1',
-          'recordCount'='2089892',
-          'sizeKey'='2217375799',
-          'skip.header.line.count'='6',
-          'typeOfData'='file')
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-rds-usage.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-rds-usage.yaml
deleted file mode 100644
index 920291b22..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-rds-usage.yaml
+++ /dev/null
@@ -1,741 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves RDS Metric data
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to be created to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: rds_usage_data
-  DAYS:
-    Type: Number
-    Description: Number of days going back that you want to get data for
-    Default: 1
-  GlueRoleArn:
-    Type: String
-    Description: ARN of the IAM role deployed to use for glue.
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  AthenaSavedQuery:
-    Description: This saved query will provide you a summary of your lambda data
-    Value:
-      Ref: AthenaQuery
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-  SQSUrl:
-    Description: TaskQueue URL the account collector lambda
-    Value: !Ref TaskQueue
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${MultiAccountRoleName}" # Need to assume a Read role in all Accounts
-        - PolicyName: !Sub "${CFDataName}-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:ListBucket"
-                  - "s3:GetBucketLocation"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${Crawler}"
-              - Effect: "Allow"
-                Action:
-                  - "cloudwatch:GetMetricStatistics"
-                Resource: "*"  ## only * can be used as a Resource for this action
-              - Effect: "Allow"
-                Action:
-                  - "sqs:ReceiveMessage"
-                  - "sqs:DeleteMessage"
-                  - "sqs:GetQueueAttributes"
-                Resource: !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:RDSUtilizationModule-TaskQueue
-              - Effect: "Allow"
-                Action:
-                  - "rds:DescribeDBProxyTargetGroups"
-                  - "rds:DescribeDBInstanceAutomatedBackups"
-                  - "rds:DescribeDBEngineVersions"
-                  - "rds:DescribeDBSubnetGroups"
-                  - "rds:DescribeGlobalClusters"
-                  - "rds:DescribeExportTasks"
-                  - "rds:DescribePendingMaintenanceActions"
-                  - "rds:DescribeEngineDefaultParameters"
-                  - "rds:DescribeDBParameterGroups"
-                  - "rds:DescribeDBClusterBacktracks"
-                  - "rds:DescribeReservedDBInstancesOfferings"
-                  - "rds:DescribeDBProxyTargets"
-                  - "rds:DownloadDBLogFilePortion"
-                  - "rds:DescribeDBInstances"
-                  - "rds:DescribeSourceRegions"
-                  - "rds:DescribeEngineDefaultClusterParameters"
-                  - "rds:DescribeDBProxies"
-                  - "rds:DescribeDBParameters"
-                  - "rds:DescribeEventCategories"
-                  - "rds:DescribeDBProxyEndpoints"
-                  - "rds:DescribeEvents"
-                  - "rds:DescribeDBClusterSnapshotAttributes"
-                  - "rds:DescribeDBClusterParameters"
-                  - "rds:DescribeEventSubscriptions"
-                  - "rds:DescribeDBSnapshots"
-                  - "rds:DescribeDBLogFiles"
-                  - "rds:DescribeDBSecurityGroups"
-                  - "rds:DescribeDBSnapshotAttributes"
-                  - "rds:DescribeReservedDBInstances"
-                  - "rds:ListTagsForResource"
-                  - "rds:DescribeValidDBInstanceModifications"
-                  - "rds:DescribeDBClusterSnapshots"
-                  - "rds:DescribeOrderableDBInstanceOptions"
-                  - "rds:DescribeOptionGroupOptions"
-                  - "rds:DescribeDBClusterEndpoints"
-                  - "rds:DescribeCertificates"
-                  - "rds:DescribeDBClusters"
-                  - "rds:DescribeAccountAttributes"
-                  - "rds:DescribeOptionGroups"
-                  - "rds:DescribeDBClusterParameterGroups"
-                  - "ec2:DescribeRegions"
-                Resource: !Sub "arn:aws:rds:${AWS::Region}:${AWS::AccountId}:*"
-              - Effect: "Allow"
-                Action:
-                  - "ec2:DescribeRegions"
-                Resource: "*"  ## only * can be used as a Resource for this action                
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Code:
-        ZipFile: |
-          import boto3
-          from botocore.exceptions import ClientError
-          import os
-          from boto3.s3.transfer import S3Transfer
-          from datetime import datetime, timedelta, date
-          import json
-          from re import sub
-          import logging
-
-          #Environment Variables
-          bucket = os.environ['S3_BUCKET']
-          prefix = os.environ['PREFIX']
-          crawler = os.environ["CRAWLER_NAME"]
-
-          functions = {'rds':
-                          {'regional' : 1,
-                          'api' : 'rds',
-                          'functions' : [
-                              {'name' : 'get_rds_stats',
-                              'output_path' : 'rds-usage-data',
-                              'output_file_name' : 'rds_stats.json' }
-                          ]
-                          }
-                      }
-
-          METRICS_FOR_VOLUMES = [
-              'FreeableMemory',
-              'CPUUtilization',
-              'NetworkReceiveThroughput',
-              'NetworkTransmitThroughput',
-              'ReadIOPS',
-              'WriteIOPS',
-              'FreeStorageSpace'
-              ]
-
-          TAGS_TO_RETRIEVE = [
-              'Environment',
-              'Schedule',
-              'Application',
-              'Project',
-          ]
-
-
-          now = datetime.utcnow()
-          DAYS = int(os.environ['DAYS'])
-          past = now - timedelta(days=DAYS)
-          today = datetime.today().strftime('%Y-%m-%d')
-          tod = date.today()
-          year = tod.year
-          month = tod.strftime('%m')
-          future = now# + timedelta(minutes=10)
-          period = 3600
-
-          def format_rds(rds):
-
-              if len(rds["Attachments"]) == 0:
-                  instance_id = "unattached"
-                  device = ""
-              else:
-                  instance_id = rds["Attachments"][0]["InstanceId"] if rds["Attachments"][0]["InstanceId"] else ""
-                  device = rds["Attachments"][0]["Device"] if rds["Attachments"][0]["Device"] else ""
-
-              output = {
-                  "az": rds["AvailabilityZone"],
-                  "instanceId": instance_id,
-                  "rdsId": rds["VolumeId"],
-                  "device": device,
-                  "rdsType": rds["VolumeType"],
-                  "sizeGB": rds["Size"],
-                  "IOPS": rds["Iops"],
-                  "rdsCreateTime": rds["CreateTime"]
-              }
-
-              tags = {}
-              filtered_tags = {}
-              if "Tags" in rds:
-                  for tag in rds["Tags"]:
-                      tags[sub('[^a-zA-Z0-9-_ *.]', '', tag["Key"].replace(",", " "))] = sub('[^a-zA-Z0-9-_ *.]', '', tag["Value"].replace(",", " "))
-              for tags_required in TAGS_TO_RETRIEVE:
-                  filtered_tags[tags_required] = tags[tags_required] if tags_required in tags else ''
-
-              output["tags"] = filtered_tags
-
-              return output
-
-
-          def get_rds_ids(rds_client):
-              rds_inventory = []
-              rds_information = rds_client.describe_rds(Filters=[{'Name': 'status','Values':['in-use','available']}])
-              if not rds_information or not rds_information['Volumes']:
-                  rds_information = []
-              else:
-                  rds_information = rds_information['Volumes']
-
-              for rds in rds_information:
-                  rds_inventory.append(format_rds(rds))
-
-              return rds_inventory
-
-  
-          def store_data_to_s3(data, region, service, path, resource_type, resource_value, filename, accountID, payer_id):
-              local_file = f"/tmp/{region}-{filename}"
-              with open(local_file, 'w') as f:
-                  json.dump(data, f, default=str)
-                  f.write('\n')
-              if os.path.getsize(local_file) == 0:
-                  print(f"No data in file for {path}")
-                  return
-              key = f"{prefix}/{path}/payer_id={payer_id}/accountid={accountID}/region={region}/{resource_type}={resource_value}/year={year}/month={month}/{today}-{filename}"
-              s3client = boto3.client('s3')
-              print("Uploading file %s to %s/%s" %(local_file, bucket, key))
-              S3Transfer(s3client).upload_file(local_file, bucket, key, extra_args={'ACL': 'bucket-owner-full-control'})
-              print('file upload successful')
-
-          def start_crawler():
-              glue_client = boto3.client('glue')
-              try:
-                  glue_client.start_crawler(Name=crawler)
-                  print("crawler started")
-              except Exception as e:
-                  # Send some context about this error to Lambda Logs
-                  print("%s" % e)
-
-          def get_rds_stats(cwclient, client, s3client, region, service, path, filename, accountID, payer_id):
-              datapoints = {}
-              data = {}
-              rds_inventory = client.describe_db_instances()
-
-              for rds in rds_inventory['DBInstances']:
-                  
-                  for metric in METRICS_FOR_VOLUMES:
-                      results = cwclient.get_metric_statistics(StartTime=past, EndTime=future, MetricName=metric,
-                      Namespace='AWS/RDS',Statistics=['Average','Maximum','Minimum'],Period=period,
-                      Dimensions=[{"Name": "DBInstanceIdentifier", "Value": rds["DBInstanceIdentifier"]}])
-                      datapoints.update({metric:results['Datapoints']})
-                  rds["Datapoints"] = datapoints
-                  store_data_to_s3(rds, region, service, path, 'rds_id', rds['DBInstanceIdentifier'], filename, accountID, payer_id)
-          
-          def assume_role(account_id, service, region):
-            role_name = os.environ['ROLENAME']
-            role_arn = f"arn:aws:iam::{account_id}:role/{role_name}" 
-            sts_client = boto3.client('sts')
-            
-            try:
-                assumedRoleObject = sts_client.assume_role(
-                    RoleArn=role_arn,
-                    RoleSessionName="AssumeRoleRoot"
-                    )
-                
-                credentials = assumedRoleObject['Credentials']
-                client = boto3.client(
-                    service,
-                    aws_access_key_id=credentials['AccessKeyId'],
-                    aws_secret_access_key=credentials['SecretAccessKey'],
-                    aws_session_token=credentials['SessionToken'],
-                    region_name = region
-                )
-                return client
-
-            except ClientError as e:
-                logging.warning(f"Unexpected error Account {account_id}: {e}")
-                return None
-
-
-          def lambda_handler(event, context):
-              try:
-                  if 'Records' not in event: 
-                      raise Exception("Please do not trigger this Lambda manually. Find an Accounts-Collector-Function-OptimizationDataCollectionStack Lambda  and Trigger from there.")
-                  
-                  for record in event['Records']:
-                      body = json.loads(record["body"])
-                      account_id = body["account_id"]
-                      payer_id = body["payer_id"]
-                      print(account_id)
-                      s3client = boto3.client('s3')
-                      regions = get_supported_regions('ec2')
-                      
-                      
-                      for service in functions.keys():
-                          if functions[service]['regional']:
-                              for region in regions:
-                                  client = assume_role(account_id, functions[service]['api'], region['RegionName'])
-                                  for f in functions[service]['functions']:
-                                      cw_client = assume_role(account_id, 'cloudwatch', region['RegionName'])
-                                      try:
-                                          data = globals()[f['name']](cw_client, client, s3client, region['RegionName'], service, f['output_path'], f['output_file_name'], account_id, payer_id)
-                                      except Exception as e:
-                                          # Send some context about this error to Lambda Logs
-                                          logging.warning(e)
-                          else:
-                              client=boto3.client(service)
-                              for f in functions[service]['functions']:
-                                  cw_client = boto3.client('cloudwatch', region_name = 'us-east-1')
-                                  try:
-                                      data = globals()[f['name']](cw_client, client, s3client, 'us-east-1', service, f['output_path'], f['output_file_name'], account_id)
-                                  except Exception as e:
-                                      # Send some context about this error to Lambda Logs
-                                      logging.warning(e)
-                      start_crawler()
-                      return "Successful"
-              except Exception as e:
-                  # Send some context about this error to Lambda Logs
-                  logging.warning(e)
-
-
-
-          def get_supported_regions(service):
-              response = []
-              if service == 'ec2':
-                  ec2_c = boto3.client('ec2')
-                  response = ec2_c.describe_regions()
-              return response['Regions'] if response['Regions'] else []
-
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          S3_BUCKET:
-            !Ref DestinationBucket
-          ACCOUNT_ID: AWS::AccountId
-          DAYS:
-            !Ref DAYS
-          CRAWLER_NAME: !Ref Crawler
-          PREFIX: !Ref CFDataName
-          ROLENAME: !Ref MultiAccountRoleName
-  Crawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-          - '${CFDataName}-Crawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleArn
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/rds-usage-data/"
-      Configuration: "{\"Version\":1.0,\"CrawlerOutput\":{\"Partitions\":{\"AddOrUpdateBehavior\":\"InheritFromTable\"}}}"
-  AthenaQuery:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: !Sub ${CFDataName}-summary-view
-      QueryString: !Sub |
-        SELECT dbinstanceidentifier, 'memory' as Metric, memory.timestamp, memory.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.FreeableMemory) as t(memory)
-        union
-        SELECT dbinstanceidentifier, 'cpu' as Metric, cpu.timestamp, cpu.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.CPUUtilization) as t(cpu)
-        union
-        SELECT dbinstanceidentifier, 'NetworkReceiveThroughput' as Metric, NetworkReceiveThroughput.timestamp, NetworkReceiveThroughput.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.NetworkReceiveThroughput) as t(NetworkReceiveThroughput)
-        union
-        SELECT dbinstanceidentifier, 'NetworkTransmitThroughput' as Metric, NetworkTransmitThroughput.timestamp, NetworkTransmitThroughput.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.CPUUtilization) as t(NetworkTransmitThroughput)
-        union
-        SELECT dbinstanceidentifier, 'ReadIOPS' as Metric, ReadIOPS.timestamp, ReadIOPS.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.ReadIOPS) as t(ReadIOPS)
-        union
-        SELECT dbinstanceidentifier, 'WriteIOPS' as Metric, WriteIOPS.timestamp, WriteIOPS.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.WriteIOPS) as t(WriteIOPS)
-        union
-        SELECT dbinstanceidentifier, 'FreeStorageSpace' as Metric, FreeStorageSpace.timestamp, FreeStorageSpace.maximum
-        FROM ${DatabaseName}.${CFDataName}
-        cross join unnest(datapoints.FreeStorageSpace) as t(FreeStorageSpace)
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: sqs.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt TaskQueue.Arn
-  TaskQueue: 
-    Type: AWS::SQS::Queue
-    Properties: 
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      KmsMasterKeyId: "alias/aws/sqs"
-      QueueName: 'RDSUtilizationModule-TaskQueue'
-  EventSourceMapping:
-    DependsOn:
-      - EventPermission
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      EventSourceArn: !GetAtt TaskQueue.Arn
-      FunctionName: !GetAtt LambdaFunction.Arn
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
-  GravitonMappingTable:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a summary view of the lambda data
-      Name: graviton_mapping
-      QueryString: !Sub |
-        CREATE EXTERNAL TABLE `rds_graviton_mapping`(
-          `dbtype` varchar(255), 
-          `databaseengine` varchar(255), 
-          `instancetype` varchar(255), 
-          `graviton_instancetype` varchar(255))
-          ROW FORMAT DELIMITED 
-          FIELDS TERMINATED BY ',' 
-        STORED AS INPUTFORMAT 
-          'org.apache.hadoop.mapred.TextInputFormat' 
-        OUTPUTFORMAT 
-          'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
-        LOCATION
-          's3://${DestinationBucket}/pricing/graviton'
-        TBLPROPERTIES (
-          'classification'='csv', 
-          'transient_lastDdlTime'='1666191659')
-
-  GravitonAthenaQuery:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a view of modernization opportunities for Graviton
-      Name: !Sub ${CFDataName}-rds-graviton
-      QueryString: |
-        WITH 
-        raw_data AS (
-          SELECT dbinstanceidentifier,
-            dbinstanceclass,
-            concat(
-              split_part(dbinstanceclass, '.', 1),
-              '.',
-              split_part(dbinstanceclass, '.', 2)
-            ) instance_family,
-            availabilityzone,
-            rtrim(availabilityzone, 'abcdef') region,
-            (CASE
-                WHEN (multiaz = false) THEN 'Single-AZ'
-                WHEN (multiaz = true) THEN 'Multi-AZ' ELSE 'Error check deploymentoption'
-              END
-            ) deploymentoption,
-            (CASE
-                WHEN (engine LIKE 'aurora%') THEN 'Aurora' ELSE 'AmazonRDS'
-              END
-            ) rds_type,
-            engine,
-            (CASE
-                WHEN (engine LIKE '%postgres%') THEN 'PostgreSQL'
-                WHEN (engine LIKE '%mysql%') THEN 'MySQL'
-                WHEN (engine LIKE '%mariadb%') THEN 'MariaDB'
-                WHEN (engine LIKE '%oracle%') THEN 'Oracle'
-                WHEN (engine LIKE '%docdb%') THEN 'DocDB'
-                WHEN (engine LIKE '%sqlserver%') THEN 'SQL Server'
-                WHEN (engine LIKE 'aurora 5.6.10a') THEN 'aurora 5.6.10a'
-                WHEN (engine LIKE '%neptune%') THEN 'Neptune' ELSE 'Check DB Engine'
-              END) db_engine,
-            (CASE
-                WHEN (engineversion LIKE '%aurora%') THEN concat(
-                  split_part(substr(engineversion, 18, 6), '.', 1),
-                  '.',
-                  split_part(substr(engineversion, 18, 6), '.', 2),
-                  '.',
-                  split_part(substr(engineversion, 18, 6), '.', 3)
-                ) ELSE engineversion
-              END) engineversion,
-            (CASE
-                WHEN (engineversion LIKE '%aurora%') THEN split_part(substr(engineversion, 18, 6), '.', 1) ELSE split_part(engineversion, '.', 1)
-              END) major,
-            (CASE
-                WHEN (engineversion LIKE '%aurora%') THEN split_part(substr(engineversion, 18, 6), '.', 2) ELSE split_part(engineversion, '.', 2)
-              END) minor,
-            (CASE
-                WHEN (engineversion LIKE '%aurora%') THEN split_part(substr(engineversion, 18, 6), '.', 3) ELSE split_part(engineversion, '.', 3)
-              END) fix,
-            accountid,
-            year,
-            month,
-            CAST("concat"("year", '-', "month", '-01') AS date) "billing_period"
-          FROM rds_usage_data),
-        rds_pricing AS (
-          SELECT (CASE
-                WHEN (databaseengine LIKE 'Aurora%') THEN 'Aurora'
-                WHEN (databaseengine = 'Any') THEN 'Any' ELSE 'AmazonRDS'
-              END
-            ) rds_type,
-            (CASE
-                WHEN (databaseengine LIKE 'Aurora%') THEN split_part(databaseengine, ' ', 2) ELSE databaseengine
-              END
-            ) db_engine,
-            deploymentoption,
-            location,
-            instancetype,
-            (CASE
-                WHEN (priceperunit = '') THEN 0E0 ELSE CAST(priceperunit AS decimal(18,2))
-              END
-            ) priceperunit,
-            unit
-          FROM optimization_data.pricing_rds
-          WHERE (((locationtype = 'AWS Region')AND (purchaseoption = ''))AND (productfamily = 'Database Instance'))),
-        graviton_mapping AS (
-          SELECT raw_data.dbinstanceidentifier,
-            raw_data.rds_type,
-            raw_data.db_engine,
-            raw_data.dbinstanceclass,
-            (CASE
-                WHEN (raw_data.dbinstanceclass LIKE '%g.%') THEN 'Already Graviton'
-                WHEN (raw_data.dbinstanceclass LIKE '%gd.%') THEN 'Already Graviton'
-                WHEN (raw_data.dbinstanceclass LIKE '%serverless%') THEN 'Ineligible' ELSE (
-                  CASE
-                    WHEN (raw_data.rds_type = 'AmazonRDS') THEN (
-                      CASE
-                        WHEN (raw_data.db_engine = 'MySQL') THEN (
-                          CASE
-                            WHEN (CAST(raw_data.major AS integer) > 8) THEN 'Eligible'
-                            WHEN (
-                              (CAST(raw_data.major AS integer) = 8)
-                              AND (CAST(raw_data.minor AS integer) > 0)
-                            ) THEN 'Eligible'
-                            WHEN (
-                              (
-                                (CAST(raw_data.major AS integer) = 8)
-                                AND (CAST(raw_data.minor AS integer) = 0)
-                              )
-                              AND (CAST(raw_data.fix AS integer) >= 17)
-                            ) THEN 'Eligible' ELSE 'Requires Update'
-                          END
-                        )
-                        WHEN (raw_data.db_engine = 'PostgreSQL') THEN (
-                          CASE
-                            WHEN (CAST(raw_data.major AS integer) > 12) THEN 'Eligible'
-                            WHEN (
-                              (CAST(raw_data.major AS integer) = 12)
-                              AND (CAST(raw_data.minor AS integer) >= 3)
-                            ) THEN 'Eligible' ELSE 'Requires Update'
-                          END
-                        )
-                        WHEN (raw_data.db_engine = 'MariaDB') THEN (
-                          CASE
-                            WHEN (CAST(raw_data.major AS integer) > 10) THEN 'Eligible'
-                            WHEN (
-                              (CAST(raw_data.major AS integer) = 10)
-                              AND (CAST(raw_data.minor AS integer) > 4)
-                            ) THEN 'Eligible'
-                            WHEN (
-                              (
-                                (CAST(raw_data.major AS integer) = 10)
-                                AND (CAST(raw_data.minor AS integer) = 4)
-                              )
-                              AND (CAST(raw_data.fix AS integer) >= 13)
-                            ) THEN 'Eligible' ELSE 'Requires Update'
-                          END
-                        ) ELSE 'Ineligible'
-                      END
-                    )
-                    WHEN (raw_data.rds_type = 'Aurora') THEN (
-                      CASE
-                        WHEN (raw_data.db_engine = 'MySQL') THEN (
-                          CASE
-                            WHEN (CAST(raw_data.major AS integer) > 2) THEN 'Eligible'
-                            WHEN (
-                              (CAST(raw_data.major AS integer) = 2)
-                              AND (CAST(raw_data.minor AS integer) > 9)
-                            ) THEN 'Eligible'
-                            WHEN (
-                              (
-                                (CAST(raw_data.major AS integer) = 2)
-                                AND (CAST(raw_data.minor AS integer) = 9)
-                              )
-                              AND (CAST(raw_data.fix AS integer) >= 2)
-                            ) THEN 'Eligible' ELSE 'Ineligible'
-                          END
-                        )
-                        WHEN (raw_data.db_engine = 'PostgreSQL') THEN (
-                          CASE
-                            WHEN (CAST(raw_data.major AS integer) > 12) THEN 'Eligible'
-                            WHEN (
-                              (CAST(raw_data.major AS integer) = 12)
-                              AND (CAST(raw_data.minor AS integer) >= 4)
-                            ) THEN 'Eligible' ELSE 'Ineligible'
-                          END
-                        ) ELSE 'Ineligible'
-                      END
-                    )
-                  END
-                )
-              END
-            ) graviton_eligible,
-            rds_graviton_mapping.graviton_instancetype,
-            raw_data.region,
-            pricing_region_names.regionname,
-            raw_data.deploymentoption,
-            raw_data.engineversion,
-            raw_data.accountid,
-            raw_data.year,
-            raw_data.month, 
-            raw_data.billing_period
-          FROM (
-              (
-                raw_data
-                LEFT JOIN optimization_data.pricing_region_names ON (raw_data.region = pricing_region_names.region)
-              )
-              LEFT JOIN optimization_data.rds_graviton_mapping ON (
-                (
-                  (raw_data.rds_type = rds_graviton_mapping.dbtype)
-                  AND (
-                    raw_data.db_engine = rds_graviton_mapping.databaseengine
-                  )
-                )
-                AND (
-                  raw_data.dbinstanceclass = rds_graviton_mapping.instancetype
-                )
-              )
-            )
-        )
-        SELECT graviton_mapping.*,
-          PL1.priceperunit existing_unit_price,
-          (PL1.priceperunit * 720) existing_monthly_price,
-          PL2.priceperunit graviton_unit_price,
-          (PL2.priceperunit * 720) graviton_montlhy_price,
-          round(
-            (
-              (PL1.priceperunit * 720) - (PL2.priceperunit * 720)
-            ),
-            2
-          ) monthly_savings,
-          round(
-            (
-              (
-                (PL1.priceperunit * 720) - (PL2.priceperunit * 720)
-              ) * 12
-            ),
-            2
-          ) estimated_annual_savings,
-          round((1 - (PL2.priceperunit / PL1.priceperunit)), 2) percentage_savings
-        FROM (
-            (
-              graviton_mapping
-              LEFT JOIN rds_pricing PL1 ON (
-                (
-                  (
-                    (
-                      (graviton_mapping.rds_type = PL1.rds_type)
-                      AND (graviton_mapping.db_engine = PL1.db_engine)
-                    )
-                    AND (
-                      graviton_mapping.deploymentoption = PL1.deploymentoption
-                    )
-                  )
-                  AND (graviton_mapping.regionname = PL1.location)
-                )
-                AND (
-                  graviton_mapping.dbinstanceclass = PL1.instancetype
-                )
-              )
-            )
-            LEFT JOIN rds_pricing PL2 ON (
-              (
-                (
-                  (
-                    (
-                      graviton_mapping.graviton_instancetype = PL2.instancetype
-                    )
-                    AND (graviton_mapping.regionname = PL2.location)
-                  )
-                  AND (graviton_mapping.rds_type = PL2.rds_type)
-                )
-                AND (graviton_mapping.db_engine = PL2.db_engine)
-              )
-              AND (
-                graviton_mapping.deploymentoption = PL2.deploymentoption
-              )
-            )
-          )
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-transit-gateway.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-transit-gateway.yaml
deleted file mode 100644
index a45ca33d4..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-transit-gateway.yaml
+++ /dev/null
@@ -1,438 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Main CF template that builds shared resources and other stacks
-Parameters:
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that is created to hold tgw data
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: transit-gateway
-  DatabaseName:
-    Type:  String
-    Description: Name of the Athena database to hold lambada information
-    Default: optimization_data
-    MinLength: 1
-  CURTable:
-    Type: String
-    Description: The name of your Cost and Usage Report table in Athena
-    Default: cid_cur.cur
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  GlueRoleArn:
-    Type: String
-    Description: ARN of the IAM role deployed to use for glue.
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  SQSUrl:
-    Description: TaskQueue URL the account collector lambda
-    Value: !Ref TaskQueue
-
-
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${MultiAccountRoleName}" # Need to assume a Read role in all Accounts
-        - PolicyName: "LambdaTWGPolicy"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${Crawler}"
-              - Effect: "Allow"
-                Action:
-                  - "sqs:ReceiveMessage"
-                  - "sqs:DeleteMessage"
-                  - "sqs:GetQueueAttributes"
-                Resource: !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:TransitGatewayModule-TaskQueue
-              - Effect: "Allow"
-                Action:
-                  - "cloudwatch:*"
-                Resource: "*"
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: "arn:aws:logs:*:*:*"
-              - Effect: "Allow"
-                Action:
-                  - "ec2:DescribeRegions"
-                Resource: "*"
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Architectures: [arm64]
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: LambdaFunction of python3.9.
-      Runtime: python3.9
-      Code:
-        ZipFile: |
-          import json
-          import boto3
-          from datetime import datetime
-          from botocore.client import Config
-          from botocore.exceptions import ClientError
-          from datetime import date, timedelta
-          import os 
-          import logging
-
-          bucket = os.environ['BUCKET_NAME']
-
-          last_day_of_prev_month = date.today().replace(day=1) - timedelta(days=1)
-          start_day_of_prev_month = date.today().replace(day=1) - timedelta(days=last_day_of_prev_month.day)
-         
-          s3_client = boto3.client('s3')
-          today = date.today()
-          year = today.year
-          month = today.month
-
-          def lambda_handler(event, context):
-              try:
-                  if 'Records' not in event: 
-                      raise Exception("Please do not trigger this Lambda manually. Find an Accounts-Collector-Function-OptimizationDataCollectionStack Lambda  and Trigger from there.")
-                  for record in event['Records']:
-                      body = json.loads(record["body"])
-                      account_id = body["account_id"]
-                      account_name = body["account_name"]
-                      payer_id = body["payer_id"]
-                      print(account_id)
-                      regions = get_supported_regions()
-                      for region_name in regions: 
-                          print(region_name)
-                          try:
-                              cw_client = assume_role('cloudwatch', account_id, region_name['RegionName'])
-                              ec2_client = assume_role('ec2', account_id, region_name['RegionName'])
-                              tgw_attachment_results = []
-                              final_result = []
-                              list_tgw_attachments = ec2_client.describe_transit_gateway_attachments()
-                              for item in list_tgw_attachments['TransitGatewayAttachments']:
-                                  tgw_attachment_results.append(item)
-                              
-                              cw_result = []
-                              for item in tgw_attachment_results:
-                                  response_in = metrics(cw_client, 'BytesIn', item)
-                                  
-                                  with open("/tmp/data.json", "w") as f:
-                                      
-                                      for cwitem in response_in['MetricDataResults']:
-                                          cw_results = {
-                                                  'TGW': item['TransitGatewayId'],
-                                                  'NetworkingAccount': item['TransitGatewayOwnerId'],
-                                                  'CustomerAccount': item['ResourceOwnerId'],
-                                                  'TGW-Attachment': item['TransitGatewayAttachmentId'],
-                                                  'BytesIn': cwitem['Values'],
-                                                  'Region': region_name['RegionName']
-                                              }
-                                  
-                                      response_out = metrics(cw_client, 'BytesOut', item)
-                                          
-                                      for cwitemout in response_out['MetricDataResults']:
-                                          cw_results['BytesOut']= cwitemout['Values']
-                                          print (cw_results)
-                                          jsondata = json.dumps(cw_results) 
-                                          f.write(jsondata)
-                                          f.write('\n')
-                                                              
-                                  s3 = boto3.client("s3", config=Config(s3={"addressing_style": "path"}))
-                                  s3.upload_file(
-                                      "/tmp/data.json",
-                                      bucket,
-                                      f"{os.environ['PREFIX']}/{os.environ['PREFIX']}-data/payer_id={payer_id}/year={year}/month={month}/tgw-{item['TransitGatewayAttachmentId']}-{region_name['RegionName']}.json")
-
-                          except Exception as e:
-                              # Send some context about this error to Lambda Logs
-                              logging.warning("%s" % e)
-                              continue
-                          
-                  start_crawler()
-                  print("Done")
-              except Exception as e:
-                  logging.warning(e)
-
-          def metrics(cw_client, byte, item):
-              cw_data = cw_client.get_metric_data(
-                      MetricDataQueries=[
-                              {
-                                  'Id': 'tgwMetric',
-                                  'MetricStat': {
-                                      'Metric': {
-                                          'Namespace': 'AWS/TransitGateway',
-                                          'MetricName': f'{byte}',
-                                          'Dimensions': [
-                                              {
-                                                  'Name': 'TransitGatewayAttachment',
-                                                  'Value': item['TransitGatewayAttachmentId']
-                                              },
-                                              {
-                                                  'Name': 'TransitGateway',
-                                                  'Value': item['TransitGatewayId']
-                                              },
-                                          ]
-                                      },
-                                      'Period': 2592000,
-                                      'Stat': 'Sum',
-                                  },
-                                  'ReturnData': True},
-                          ],
-                          StartTime=start_day_of_prev_month.strftime("%Y-%m-%dT%H:%M:%SZ"),
-                          EndTime=last_day_of_prev_month.strftime("%Y-%m-%dT%H:%M:%SZ"),
-                          ScanBy='TimestampDescending'
-                      )
-
-              return cw_data
-
-          def assume_role(service, account_id, region_name):
-              role_name = os.environ['ROLENAME']
-              role_arn = f"arn:aws:iam::{account_id}:role/{role_name}"
-              sts_client = boto3.client('sts')
-              
-              try:
-                  assumedRoleObject = sts_client.assume_role(
-                      RoleArn=role_arn,
-                      RoleSessionName="cross_acct_lambda"
-                      )
-                  
-                  credentials = assumedRoleObject['Credentials']
-                  client = boto3.client(
-                      service, 
-                      region_name=region_name,
-                      aws_access_key_id=credentials['AccessKeyId'],
-                      aws_secret_access_key=credentials['SecretAccessKey'],
-                      aws_session_token=credentials['SessionToken']
-                  )
-                  return client
-              
-              except ClientError as e:
-                  logging.warning(f"Unexpected error Account {account_id}: {e}")
-                  return None
-
-          def start_crawler():
-              glue_client = boto3.client("glue")
-              Crawler_Name = os.environ["CRAWLER_NAME"]
-              try:
-                  glue_client.start_crawler(Name=Crawler_Name)
-                  print(f"{Crawler_Name} has been started")
-              except Exception as e:
-                  # Send some context about this error to Lambda Logs
-                  logging.warning("%s" % e)
-
-          def get_supported_regions():
-              response = []              
-              ec2_c = boto3.client('ec2')
-              response = ec2_c.describe_regions()
-              return response['Regions'] if response['Regions'] else []
-
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          BUCKET_NAME: !Ref DestinationBucket
-          ROLENAME: !Ref MultiAccountRoleName
-          CRAWLER_NAME: !Ref Crawler
-          PREFIX: !Ref CFDataName
-
-  Crawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-          - '${CFDataName}-Crawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleArn
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/${CFDataName}-data/"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: sqs.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt TaskQueue.Arn
-  TaskQueue:
-    Type: AWS::SQS::Queue
-    Properties:
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      KmsMasterKeyId: "alias/aws/sqs"
-      QueueName: 'TransitGatewayModule-TaskQueue'
-  EventSourceMapping:
-    DependsOn:
-      - EventPermission
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      EventSourceArn: !GetAtt TaskQueue.Arn
-      FunctionName: !GetAtt LambdaFunction.Arn
-
-  AthenaQueryCUR:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a chargeback view of the transit gateway
-      Name: transit_gateway_chargeback_cur
-      QueryString: !Sub
-        CREATE OR REPLACE VIEW "transit_gateway_chargeback" AS
-        WITH
-          cur_all AS (
-          SELECT *
-          FROM
-          ${DatabaseName}.transit_gateway_data
-        )
-        , customer_tgw_data AS (
-          SELECT
-            bill_billing_period_start_date
-          , bill_payer_account_id
-          , bill_billing_entity
-          , line_item_usage_start_date
-          , line_item_usage_account_id
-          , line_item_line_item_type
-          , line_item_product_code
-          , line_item_usage_type
-          , line_item_operation
-          , line_item_line_item_description
-          , product_product_name
-          , product_operation
-          , product_product_family
-          , product_servicecode
-          , product_servicename
-          , product_location
-          , year
-          , month
-          , sum(CAST(line_item_usage_amount AS decimal(16,8))) as usage_amount
-          , CAST((sum(line_item_usage_amount) / sum(sum(line_item_usage_amount)) OVER (PARTITION BY product_location)) AS decimal(5,2)) as percentage
-          FROM
-            ${CURTable}
-          WHERE line_item_usage_account_id <> '${AWS::AccountId}'
-          AND product_location LIKE '%US%'
-          AND product_group = 'AWSTransitGateway'
-          AND pricing_unit = 'GigaBytes'
-          GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18
-        )
-        , network_all AS (
-          SELECT
-            bill_payer_account_id
-          , bill_billing_period_start_date
-          , CAST(sum(CASE WHEN (line_item_line_item_type = 'EdpDiscount') THEN line_item_unblended_cost ELSE 0 END) AS decimal(5,2)) as EDP_Discounts
-          , CAST(sum(CASE WHEN (product_group = 'AWSTransitGateway') THEN line_item_unblended_cost ELSE 0 END) AS decimal(5,2)) as Total_Cost
-          FROM
-            ${CURTable}
-          WHERE
-          line_item_line_item_type <> 'Tax'
-          AND line_item_usage_account_id = '${AWS::AccountId}'
-          AND line_item_product_code = 'AmazonVPC'
-          AND (line_item_operation = 'CreateVpnConnection'
-          OR line_item_operation = 'TransitGatewayVPC' 
-          OR line_item_operation = 'TransitGatewayVPN'
-          OR line_item_operation = 'TransitGatewayPeering')
-          GROUP BY 1, 2
-        )
-        SELECT
-          customer_tgw_data.bill_billing_period_start_date
-        , customer_tgw_data.bill_payer_account_id
-        , bill_billing_entity
-        , line_item_usage_start_date
-        , line_item_usage_account_id
-        , line_item_line_item_type
-        , line_item_product_code
-        , line_item_usage_type
-        , line_item_operation
-        , line_item_line_item_description
-        , product_product_name
-        , product_operation
-        , product_product_family
-        , product_servicecode
-        , product_servicename
-        , Percentage as chargeback_proportion
-        , Total_Cost as total_Networking_cost
-        , (Total_Cost * Percentage) as chargeback_cost
-        , Year
-        , Month
-        FROM
-          customer_tgw_data
-        LEFT JOIN network_all ON
-          customer_tgw_data.bill_billing_period_start_date = network_all.bill_billing_period_start_date
-          AND network_all.bill_payer_account_id = customer_tgw_data.bill_payer_account_id
-        ORDER BY Percentage DESC
-
-  AthenaQueryCW:
-    Type: AWS::Athena::NamedQuery
-    Properties:
-      Database: !Ref DatabaseName
-      Description: Provides a chargeback view of joined data from cloudwath and transigateway 
-      Name: transit_gateway_chargeback_cw
-      QueryString: !Sub
-        CREATE OR REPLACE VIEW "transit_gateway_chargeback_to_customer_final_results" AS 
-        WITH
-          summary AS (
-            SELECT
-              *
-            , (sum(bytesin[1]) + sum(bytesout[1]) OVER (PARTITION BY "bill_payer_account_id")) as total_data_transfer
-            , (sum(bytesin[1]) + sum(bytesout[1])) as usage_account_dx_total
-            FROM
-              ${DatabaseName}.transit_gateway_data a
-            LEFT JOIN ${DatabaseName}.transit_gateway_chargeback b ON a.customeraccount = b.line_item_usage_account_id AND a.year = b.year AND a.month = b.month
-            GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29
-            ORDER BY bytesIn DESC
-          )
-          SELECT
-            *
-          , (usage_account_dx_total / total_data_transfer) as chargeback_percentage
-          , ("total_Networking_cost" * (usage_account_dx_total / total_data_transfer)) as chargeback_cost_final
-          FROM
-            summary
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/module-trusted-advisor.yaml b/static/Cost/300_Optimization_Data_Collection/Code/module-trusted-advisor.yaml
deleted file mode 100644
index a988af892..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/module-trusted-advisor.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Retrieves Inventory data for the chosen service
-Parameters:
-  DatabaseName:
-    Type: String
-    Description: Name of the Athena database to be created to hold lambda information
-    Default: optimization_data
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket to be created to hold data information
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  MultiAccountRoleName:
-    Type: String
-    Description: Name of the IAM role deployed in all accounts which can retrieve AWS Data.
-  CFDataName:
-    Type: String
-    Description: The name of what this cf is doing.
-    Default: trusted-advisor
-  DestinationBucketARN:
-    Type: String
-    Description: ARN of the S3 Bucket that exists or needs to be created to hold rightsizing information
-  CodeBucket:
-    Type: String
-    Description: S3 Bucket that exists and holds code
-    Default: aws-well-architected-labs
-  CodeKey:
-    Type: String
-    Description: file name of ZipFile with data code
-    Default: Cost/Labs/300_Optimization_Data_Collection/ta.zip
-  RolePrefix:
-    Type: String
-    Description: This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable
-  GlueRoleARN:
-    Type: String
-  LambdaAnalyticsARN:
-    Type: String
-    Description: Arn of lambda for Analytics
-Outputs:
-  LambdaRoleARN:
-    Description: Role for Lambda execution of lambda data.
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn
-  GlueCrawler:
-    Value:
-      Fn::Sub: "${CFDataName}Crawler"
-  SQSUrl:
-    Description: TaskQueue URL the account collector lambda
-    Value: !Ref TaskQueue
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}Lambda-Role-${CFDataName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Path: /
-      Policies:
-        - PolicyName: !Sub "Assume-Management-${CFDataName}-Account-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource: !Sub "arn:aws:iam::*:role/${MultiAccountRoleName}" # Need to assume a Read role in all Accounts
-        - PolicyName: !Sub "${CFDataName}-S3-Access"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: 
-                  - !Ref DestinationBucketARN
-                  - !Sub "${DestinationBucketARN}/*"
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: !Sub "arn:aws:glue:${AWS::Region}:${AWS::AccountId}:crawler/${Crawler}"
-              - Effect: "Allow"
-                Action:
-                  - "sqs:ReceiveMessage"
-                  - "sqs:DeleteMessage"
-                  - "sqs:GetQueueAttributes"
-                Resource: !Sub arn:aws:sqs:${AWS::Region}:${AWS::AccountId}:TrustedAdvisorModule-TaskQueue
-  LambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub
-          - '${CFDataName}-Lambda-Function-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Description: !Sub "LambdaFunction to retrieve ${CFDataName}"
-      Runtime: python3.8
-      Code:
-         S3Bucket: !Ref CodeBucket
-         S3Key: !Ref CodeKey
-      Handler: 'main.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role: !GetAtt LambdaRole.Arn
-      Environment:
-        Variables:
-          BUCKET_NAME: !Ref DestinationBucket
-          ROLENAME: !Ref MultiAccountRoleName
-          PREFIX: !Ref CFDataName
-          CRAWLER_NAME: !Ref Crawler
-          COSTONLY: "no"
-  Crawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: !Sub
-          - '${CFDataName}-Crawler-${Id}'
-          - Id: !Select [0, !Split ['-', !Ref AWS::StackName]]
-      Role: !Ref GlueRoleARN
-      DatabaseName: !Ref DatabaseName
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/${CFDataName}/${CFDataName}-data/"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaFunction.Arn
-      Action: lambda:InvokeFunction
-      Principal: sqs.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt TaskQueue.Arn
-  TaskQueue:
-    Type: AWS::SQS::Queue
-    Properties:
-      VisibilityTimeout: 300
-      ReceiveMessageWaitTimeSeconds: 20
-      DelaySeconds: 2
-      KmsMasterKeyId: "alias/aws/sqs"
-      QueueName: 'TrustedAdvisorModule-TaskQueue'
-  EventSourceMapping:
-    DependsOn:
-      - EventPermission
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      EventSourceArn: !GetAtt TaskQueue.Arn
-      FunctionName: !GetAtt LambdaFunction.Arn
-  LambdaAnalyticsExecutor:
-    Type: Custom::LambdaAnalyticsExecutor
-    Properties:
-      ServiceToken: !Ref LambdaAnalyticsARN
-      Name: !Ref CFDataName
\ No newline at end of file
diff --git a/static/Cost/300_Optimization_Data_Collection/Code/optimisation_read_only_role.yaml b/static/Cost/300_Optimization_Data_Collection/Code/optimisation_read_only_role.yaml
deleted file mode 100644
index 8cc337e13..000000000
--- a/static/Cost/300_Optimization_Data_Collection/Code/optimisation_read_only_role.yaml
+++ /dev/null
@@ -1,304 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Stack that will deployed across all accounts in an org so we can assume to read data using a lambda 
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-    - Label:
-        default: 'Deployment parameters'
-      Parameters:
-        - CostAccountID
-        - MultiAccountRoleName
-        - RolePrefix
-    - Label:
-        default: 'Available modules'
-      Parameters:
-        - IncludeTAModule
-        - IncludeInventoryCollectorModule
-        - IncludeECSChargebackModule
-        - IncludeRDSUtilizationModule
-        - IncludeBudgetsModule
-        - IncludeTransitGatewayModule
-    ParameterLabels:
-      CostAccountID:
-        default: 'Cost Account Id'
-      MultiAccountRoleName:
-        default: 'Multi Account Role Name'
-      RolePrefix:
-        default: "Role Prefix"
-      IncludeTAModule:
-        default: 'Include AWS Trusted Advisor Data Collection Module'
-      IncludeInventoryCollectorModule:
-        default: 'Include Inventory Collector Module'
-      IncludeECSChargebackModule:
-        default: 'Include ECS Chargeback Data Collection Module'
-      IncludeRDSUtilizationModule:
-        default: 'Include RDS Utilization Data Collection Module' 
-      IncludeBudgetsModule:
-        default: 'Include Budgets Collection Module'    
-      IncludeTransitGatewayModule:
-        default: 'Include Transit Gateway Module'  
-Parameters:
-  CostAccountID:
-    Type: String
-    Description: AccountId of where the collector is deployed
-  MultiAccountRoleName:
-    Type: String
-    Description: The name of the IAM role that will be deployed from the management account to linked accounts as a read only role. DO NOT ENTER THE ROLE PREFIX HERE. KEEP THE SAME AS WHAT IS DEPLOYED INTO MANAGEMENT ACCOUNT.
-    Default: "Optimization-Data-Multi-Account-Role"
-  RolePrefix:
-    Type: String
-    Description: Keep this consistent with the prefix used for the Stacks and StackSets created as part of this lab. This prefix will be placed in front of all roles created. Note you may wish to add a dash at the end to make more readable e.g. prefix-
-    Default: "WA-"
-  IncludeTAModule:
-    Type: String
-    Description: Collects AWS Trusted Advisor recommendations data
-    AllowedValues:
-      - "yes"
-      - "no"  
-  IncludeInventoryCollectorModule:
-    Type: String
-    Description: Collects data about AMIs, EBS volumes and snapshots
-    AllowedValues:
-      - "yes"
-      - "no" 
-  IncludeECSChargebackModule:
-    Type: String
-    Description: Collects data which shows costs associated with ECS Tasks leveraging EC2 instances within a Cluster
-    AllowedValues:
-      - "yes"
-      - "no" 
-  IncludeRDSUtilizationModule:
-    Type: String
-    Description: Collects RDS CloudWatch metrics from your accounts
-    AllowedValues:
-      - "yes"
-      - "no" 
-  IncludeBudgetsModule:
-    Type: String
-    Description: Collects budgets from your accounts
-    AllowedValues:
-      - "yes"
-      - "no"
-  IncludeTransitGatewayModule:
-    Type: String
-    Description: Collects TransitGateway from your accounts
-    AllowedValues:
-      - "yes"
-      - "no"    
-
-Conditions:
-  IncludeTAModulePolicy: !Equals 
-    - !Ref IncludeTAModule
-    - "yes"
-  IncludeInventoryCollectorModulePolicy: !Equals 
-    - !Ref IncludeInventoryCollectorModule
-    - "yes"
-  IncludeECSChargebackModulePolicy: !Equals 
-    - !Ref IncludeECSChargebackModule
-    - "yes"
-  IncludeRDSUtilizationModulePolicy: !Equals
-    - !Ref IncludeRDSUtilizationModule
-    - "yes"  
-  IncludeBudgetsModulePolicy: !Equals
-    - !Ref IncludeBudgetsModule
-    - "yes"
-  IncludeTransitGatewayModulePolicy: !Equals
-    - !Ref IncludeTransitGatewayModule
-    - "yes"
-
-Outputs:
-  LambdaRole:
-    Description: For lambda to assume in cost account 
-    Value:
-      Fn::GetAtt:
-        - LambdaRole
-        - Arn 
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub "${RolePrefix}${MultiAccountRoleName}"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              AWS:
-                -  !Sub "arn:aws:iam::${CostAccountID}:root"
-        Version: 2012-10-17
-      Path: /
-  AMIPolicy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: ami
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "imagebuilder:ListImages"
-              - "imagebuilder:GetImage"
-            Resource: "*" ## only * can be used as a Resource for this action
-      Roles:
-        - Ref: LambdaRole
-  TAPolicy:
-    Type: 'AWS::IAM::Policy'
-    Condition: IncludeTAModulePolicy
-    Properties:
-      PolicyName: TAPolicy
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "trustedadvisor:Describe*"
-              - "trustedadvisor:List*"
-              - "trustedadvisor:GenerateReport"
-              - "trustedadvisor:IncludeCheckItems"
-              - "trustedadvisor:ExcludeCheckItems"
-              - "trustedadvisor:RefreshCheck"                   
-              - "support:DescribeTrustedAdvisorChecks"
-              - "support:DescribeTrustedAdvisorCheckResult"
-            Resource: "*" ## only * can be used as a Resource for this action
-      Roles:
-        - Ref: LambdaRole
-  BudgetsReadOnlyPolicy:
-    Type: 'AWS::IAM::Policy'
-    Condition: IncludeBudgetsModulePolicy
-    Properties:
-      PolicyName: BudgetsReadOnlyPolicy
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "budgets:ViewBudget"
-              - "budgets:Describe*"
-            Resource: "arn:aws:budgets::*:budget/*" ## only * can be used as a Resource for this action
-      Roles:
-        - Ref: LambdaRole
-  InventoryCollectorPolicy:
-    Type: 'AWS::IAM::Policy'
-    Condition: IncludeInventoryCollectorModulePolicy
-    Properties:
-      PolicyName: InventoryCollectorPolicy
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "ec2:DescribeImages"
-              - "ec2:DescribeVolumeStatus"
-              - "ec2:DescribeVolumes"
-              - "ec2:DescribeSnapshots"
-              - "ec2:DescribeSnapshotAttribute"
-            Resource: "*" ## only * can be used for inventory
-      Roles:
-        - Ref: LambdaRole
-  ECSChargebackPolicy:
-    Type: 'AWS::IAM::Policy'
-    Condition: IncludeECSChargebackModulePolicy
-    Properties:
-      PolicyName: ECSChargebackPolicy
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "ecs:ListAttributes"
-              - "ecs:DescribeTaskSets"
-              - "ecs:DescribeTaskDefinition"
-              - "ecs:DescribeClusters"
-              - "ecs:ListServices"
-              - "ecs:ListAccountSettings"
-              - "ecs:DescribeCapacityProviders"
-              - "ecs:ListTagsForResource"
-              - "ecs:ListTasks"
-              - "ecs:ListTaskDefinitionFamilies"
-              - "ecs:DescribeServices"
-              - "ecs:ListContainerInstances"
-              - "ecs:DescribeContainerInstances"
-              - "ecs:DescribeTasks"
-              - "ecs:ListTaskDefinitions"
-              - "ecs:ListClusters"
-            Resource: "*" ## only * can be used for inventory
-      Roles:
-        - Ref: LambdaRole 
-  RDSUtilizationPolicy:
-    Type: 'AWS::IAM::Policy'
-    Condition: IncludeRDSUtilizationModulePolicy
-    Properties:
-      PolicyName: RDSUtilizationPolicy
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "rds:DescribeDBProxyTargetGroups"
-              - "rds:DescribeDBInstanceAutomatedBackups"
-              - "rds:DescribeDBEngineVersions"
-              - "rds:DescribeDBSubnetGroups"
-              - "rds:DescribeGlobalClusters"
-              - "rds:DescribeExportTasks"
-              - "rds:DescribePendingMaintenanceActions"
-              - "rds:DescribeEngineDefaultParameters"
-              - "rds:DescribeDBParameterGroups"
-              - "rds:DescribeDBClusterBacktracks"
-              - "rds:DescribeCustomAvailabilityZones"
-              - "rds:DescribeReservedDBInstancesOfferings"
-              - "rds:DescribeDBProxyTargets"
-              - "rds:DownloadDBLogFilePortion"
-              - "rds:DescribeDBInstances"
-              - "rds:DescribeSourceRegions"
-              - "rds:DescribeEngineDefaultClusterParameters"
-              - "rds:DescribeInstallationMedia"
-              - "rds:DescribeDBProxies"
-              - "rds:DescribeDBParameters"
-              - "rds:DescribeEventCategories"
-              - "rds:DescribeDBProxyEndpoints"
-              - "rds:DescribeEvents"
-              - "rds:DescribeDBClusterSnapshotAttributes"
-              - "rds:DescribeDBClusterParameters"
-              - "rds:DescribeEventSubscriptions"
-              - "rds:DescribeDBSnapshots"
-              - "rds:DescribeDBLogFiles"
-              - "rds:DescribeDBSecurityGroups"
-              - "rds:DescribeDBSnapshotAttributes"
-              - "rds:DescribeReservedDBInstances"
-              - "rds:ListTagsForResource"
-              - "rds:DescribeValidDBInstanceModifications"
-              - "rds:DescribeDBClusterSnapshots"
-              - "rds:DescribeOrderableDBInstanceOptions"
-              - "rds:DescribeOptionGroupOptions"
-              - "rds:DescribeDBClusterEndpoints"
-              - "rds:DescribeCertificates"
-              - "rds:DescribeDBClusters"
-              - "rds:DescribeAccountAttributes"
-              - "rds:DescribeOptionGroups"
-              - "rds:DescribeDBClusterParameterGroups"
-            Resource: "*"
-          - Effect: "Allow" ## only * can be used for inventory
-            Action:
-              - "ec2:DescribeRegions"
-              - "cloudwatch:GetMetricStatistics"
-            Resource: "*" ## only * can be used as a Resource for this action
-      Roles:
-        - Ref: LambdaRole
-  TransitGatewayPolicy:
-    Type: 'AWS::IAM::Policy'
-    Condition: IncludeTransitGatewayModulePolicy
-    Properties:
-      PolicyName: TransitGatewayPolicy
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Action:
-              - "ec2:DescribeTransitGatewayAttachments"
-              - "cloudwatch:Describe*"
-              - "cloudwatch:Get*"
-              - "cloudwatch:List*"
-            Resource: "*" ## only * can be used for inventory
-      Roles:
-        - Ref: LambdaRole 
diff --git a/static/Cost/300_Organization_Data_CUR_Connection/Code/Management.yaml b/static/Cost/300_Organization_Data_CUR_Connection/Code/Management.yaml
deleted file mode 100644
index 68ed51aff..000000000
--- a/static/Cost/300_Organization_Data_CUR_Connection/Code/Management.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploys IAM role to collect organizations data
-Parameters:
-  DeploymentetAccountID:
-    Type: String
-    Description: AccountId of where the collector is deployed
-Resources:
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: "OrganizationLambdaAccessRole"
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              AWS:
-                - !Sub "arn:aws:iam::${DeploymentetAccountID}:role/LambdaOrgRole" 
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AWSLambdaExecute
-      Path: /
-      Policies:
-        - PolicyName: "organizations-permissons"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "organizations:ListAccountsForParent"
-                  - "organizations:ListRoots"
-                  - "organizations:ListCreateAccountStatus"
-                  - "organizations:ListAccounts"
-                  - "organizations:ListTagsForResource"
-                  - "organizations:DescribeOrganization"
-                  - "organizations:DescribeOrganizationalUnit"
-                  - "organizations:DescribeAccount"
-                  - "organizations:ListParents"
-                  - "organizations:ListOrganizationalUnitsForParent"
-                  - "organizations:ListChildren"
-                Resource: "*"
\ No newline at end of file
diff --git a/static/Cost/300_Organization_Data_CUR_Connection/Code/main.yaml b/static/Cost/300_Organization_Data_CUR_Connection/Code/main.yaml
deleted file mode 100644
index 083a85e08..000000000
--- a/static/Cost/300_Organization_Data_CUR_Connection/Code/main.yaml
+++ /dev/null
@@ -1,302 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Main CF template that builds shared resources and other stacks
-Parameters:
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that is created to hold org data
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  Tags:
-    Type: String
-    Description: List of tags from your Organisation you would like to include separated by a comma.
-  ManagementAccountId:
-    Type: String
-    Description: Your Management Account Id - Make sure no spaces when putting in
-  DatabaseName:
-    Type: String
-    Description: Athena Database name where you table will be created
-    Default: managementcur
-Resources:
-  S3Bucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      BucketName:
-        Ref: DestinationBucket
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Lambda Org Data trigger
-      Name: Lambda_Org_Data
-      ScheduleExpression: "cron(0 6 ? * MON *)"
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-            - LambdaOrgData
-            - Arn
-          Id: WeeklyTriggerForOrgdata
-  GlueRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: AWS-Organization-Data-Glue-Crawler
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - glue.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole
-      Path: /
-      Policies:
-        - PolicyName: "Get-AWS-Organization-Data-S3"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:GetObject"
-                Resource: !Join
-                          - ''
-                          - - !GetAtt S3Bucket.Arn 
-                            - '*'
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: LambdaOrgRole
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AWSLambdaExecute
-      Path: /
-      Policies:
-        - PolicyName: "Assume-Management-Orgonisation-Data-Role"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action: "sts:AssumeRole"
-                Resource:
-                  !Sub "arn:aws:iam::${ManagementAccountId}:role/OrganizationLambdaAccessRole"
-        - PolicyName: "LambdaOrgPolicy"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: !GetAtt S3Bucket.Arn 
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: "*"
-              - Effect: "Allow"
-                Action:
-                  - "organizations:ListAccountsForParent"
-                  - "organizations:ListRoots"
-                  - "organizations:ListCreateAccountStatus"
-                  - "organizations:ListAccounts"
-                  - "organizations:ListTagsForResource"
-                  - "organizations:DescribeOrganization"
-                  - "organizations:DescribeOrganizationalUnit"
-                  - "organizations:DescribeAccount"
-                  - "organizations:ListParents"
-                  - "organizations:ListOrganizationalUnitsForParent"
-                  - "organizations:ListChildren"
-                Resource: "*"
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: "arn:aws:logs:*:*:*"
-  LambdaOrgData:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: Lambda_Org_Data
-      Description: LambdaFunctioni of python3.8.
-      Runtime: python3.8
-      Code:
-        # S3Key: index.py.zip
-        # S3Bucket: !Ref AWSCodeBucketName
-        ZipFile: |
-          #!/usr/bin/env python3
-          #Gets org data, grouped by ous and tags from managment accounts in json
-          #Author Stephanie Gooch 2020
-          import argparse
-          import boto3
-          from botocore.exceptions import ClientError
-          from botocore.client import Config
-          import os
-          import datetime
-          import json
-
-          def myconverter(o):
-              if isinstance(o, datetime.datetime):
-                  return o.__str__()
-
-          def list_tags(client, resource_id):
-              tags = []
-              paginator = client.get_paginator("list_tags_for_resource")
-              response_iterator = paginator.paginate(ResourceId=resource_id)
-              for response in response_iterator:
-                  tags.extend(response['Tags'])
-              return tags
-              
-          def lambda_handler(event, context):
-              management_account_id = os.environ["MANAGMENT_ACCOOUNT_ID"]
-              sts_connection = boto3.client('sts')
-              acct_b = sts_connection.assume_role(
-                  RoleArn=f"arn:aws:iam::{management_account_id}:role/OrganizationLambdaAccessRole",
-                  RoleSessionName="cross_acct_lambda"
-              )
-              ACCESS_KEY = acct_b['Credentials']['AccessKeyId']
-              SECRET_KEY = acct_b['Credentials']['SecretAccessKey']
-              SESSION_TOKEN = acct_b['Credentials']['SessionToken']
-              client = boto3.client(
-                  "organizations", region_name="us-east-1", #Using the Organizations client to get the data. This MUST be us-east-1 regardless of region you have the Lamda in
-                  aws_access_key_id=ACCESS_KEY, aws_secret_access_key=SECRET_KEY, aws_session_token=SESSION_TOKEN,)
-
-              root_id    = client.list_roots()['Roots'][0]['Id']
-              ou_id_list = get_ou_ids(root_id, client)
-              
-              with open('/tmp/ou-org.json', 'w') as f:
-                  for ou in ou_id_list.keys():
-                      account_data(f, ou, ou_id_list[ou][0], client)
-              s3_upload('ou-org')
-
-              with open('/tmp/acc-org.json', 'w') as f:
-                  account_data(f, root_id, root_id, client)
-              s3_upload('acc-org')
-
-          def account_data(f, parent, parent_name, client):
-              tags_check = os.environ["TAGS"]
-              account_id_list = get_acc_ids(parent, client)
-              for account_id in account_id_list:
-                  response = client.describe_account(AccountId=account_id)
-                  account  = response["Account"]          
-                  if tags_check != '':
-                      tags_list = list_tags(client, account["Id"])
-                      for tag in os.environ.get("TAGS").split(","):
-                          for org_tag in tags_list:
-                              if tag == org_tag['Key']: 
-                                  value = org_tag['Value']
-                                  kv = {tag : value}
-                                  account.update(kv)
-                  account.update({'Parent' : parent_name})        
-                  data = json.dumps(account, default = myconverter) 
-
-                  f.write(data)
-                  f.write('\n')
-
-          def s3_upload(file_name):
-              bucket = os.environ["BUCKET_NAME"] 
-              try:
-                  s3 = boto3.client('s3', os.environ["REGION"],config=Config(s3={'addressing_style': 'path'}))
-                  s3.upload_file(f'/tmp/{file_name}.json', bucket, f"organisation-data/{file_name}.json") 
-                  print(f"{file_name}org data in s3")
-              except Exception as e:
-                  print(e)
-
-          def ou_loop(parent_id, test, client):
-            print(parent_id)
-            paginator = client.get_paginator('list_children')
-            iterator = paginator.paginate( ParentId=parent_id, ChildType='ORGANIZATIONAL_UNIT')
-            for page in iterator:
-                for ou in page['Children']:
-                    test.append(ou['Id'])
-                    ou_loop(ou['Id'], test, client)
-            return test
-
-          def get_ou_ids(parent_id, client):
-              full_result = {}
-              test = []
-              ous = ou_loop(parent_id, test, client)
-              print(ous)
-
-              for ou in ous:
-                  ou_info = client.describe_organizational_unit(OrganizationalUnitId=ou)
-                  full_result[ou]=[]
-                  full_result[ou].append(ou_info['OrganizationalUnit']['Name'])
-              return full_result
-
-          def get_acc_ids(parent_id,  client):
-            full_result = []
-            paginator = client.get_paginator('list_accounts_for_parent')
-            iterator  = paginator.paginate(ParentId=parent_id)
-            for page in iterator:
-              for acc in page['Accounts']:
-                print(acc['Id'])
-                full_result.append(acc['Id'])
-            return full_result
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role: 
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          TAGS:
-            Fn::Sub: ${Tags}
-          BUCKET_NAME: !Ref DestinationBucket
-          REGION: !Ref "AWS::Region"
-          MANAGMENT_ACCOOUNT_ID: !Ref ManagementAccountId
-  OrgCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: Org_Glue_Crawler
-      Role: !GetAtt GlueRole.Arn 
-      DatabaseName: !Ref DatabaseName
-      Schedule:
-        ScheduleExpression: "cron(0 8 ? * MON *)"
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/organisation-data/"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaOrgData.Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-Outputs:
-  S3Bucket:
-    Description: Name of S3 Bucket which will store the AWS Organization Data
-    Value:
-      Ref: S3Bucket
-  S3BucketARN:
-    Description: ARN of S3 Bucket which will store the AWS Organization Data
-    Value:
-       Fn::GetAtt:
-        - S3Bucket
-        - Arn 
-  GlueCrawlerRoleARN:
-    Value:
-      Fn::GetAtt:
-        - GlueRole
-        - Arn
-
diff --git a/static/Cost/300_Organization_Data_CUR_Connection/Code/main_man.yaml b/static/Cost/300_Organization_Data_CUR_Connection/Code/main_man.yaml
deleted file mode 100644
index 0eb29cc9e..000000000
--- a/static/Cost/300_Organization_Data_CUR_Connection/Code/main_man.yaml
+++ /dev/null
@@ -1,277 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Description: Main CF template that builds shared resources and other stacks
-Parameters:
-  DestinationBucket:
-    Type: String
-    Description: Name of the S3 Bucket that is created to hold org data
-    AllowedPattern: (?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)
-  Tags:
-    Type: String
-    Description: List of tags from your Organisation you would like to include separated by a comma.
-  DatabaseName:
-    Type: String
-    Description: Athena Database name where you table will be created
-    Default: managementcur
-Resources:
-  S3Bucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      BucketName:
-        Ref: DestinationBucket
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-  CloudWatchTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Lambda Org Data trigger
-      Name: Lambda_Org_Data
-      ScheduleExpression: "cron(0 6 ? * MON *)"
-      State: ENABLED
-      Targets:
-        - Arn:
-            Fn::GetAtt:
-            - LambdaOrgData
-            - Arn
-          Id: WeeklyTriggerForOrgdata
-  GlueRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: AWS-Organization-Data-Glue-Crawler
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - glue.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole
-      Path: /
-      Policies:
-        - PolicyName: "Get-AWS-Organization-Data-S3"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                  - "s3:GetObject"
-                Resource: !Join
-                          - ''
-                          - - !GetAtt S3Bucket.Arn 
-                            - '*'
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: LambdaOrgRole
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AWSLambdaExecute
-      Path: /
-      Policies:
-        - PolicyName: "LambdaOrgPolicy"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: "Allow"
-                Action:
-                  - "s3:PutObject"
-                Resource: !GetAtt S3Bucket.Arn 
-              - Effect: "Allow"
-                Action:
-                  - "glue:StartCrawler"
-                Resource: "*"
-              - Effect: "Allow"
-                Action:
-                  - "organizations:ListAccountsForParent"
-                  - "organizations:ListRoots"
-                  - "organizations:ListCreateAccountStatus"
-                  - "organizations:ListAccounts"
-                  - "organizations:ListTagsForResource"
-                  - "organizations:DescribeOrganization"
-                  - "organizations:DescribeOrganizationalUnit"
-                  - "organizations:DescribeAccount"
-                  - "organizations:ListParents"
-                  - "organizations:ListOrganizationalUnitsForParent"
-                  - "organizations:ListChildren"
-                Resource: "*"
-              - Effect: "Allow"
-                Action:
-                  - "logs:CreateLogGroup"
-                  - "logs:CreateLogStream"
-                  - "logs:PutLogEvents"
-                  - "logs:DescribeLogStreams"
-                Resource: "arn:aws:logs:*:*:*"
-  LambdaOrgData:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: Lambda_Org_Data
-      Description: LambdaFunctioni of python3.8.
-      Runtime: python3.8
-      Code:
-        # S3Key: index.py.zip
-        # S3Bucket: !Ref AWSCodeBucketName
-        ZipFile: |
-          #!/usr/bin/env python3
-          #Gets org data, grouped by ous and tags from management accounts in json
-          import argparse
-          import boto3
-          from botocore.exceptions import ClientError
-          from botocore.client import Config
-          import os
-          import datetime
-          import json
-
-          def myconverter(o):
-              if isinstance(o, datetime.datetime):
-                  return o.__str__()
-
-          def list_tags(client, resource_id):
-              tags = []
-              paginator = client.get_paginator("list_tags_for_resource")
-              response_iterator = paginator.paginate(ResourceId=resource_id)
-              for response in response_iterator:
-                  tags.extend(response['Tags'])
-              return tags
-              
-          def lambda_handler(event, context):
-              client = boto3.client( "organizations", region_name="us-east-1") #This MUST be us-east-1 regardless of region you have the Lambda in
-              root_id    = client.list_roots()['Roots'][0]['Id']
-              ou_id_list = get_ou_ids(root_id, client)
-
-              with open('/tmp/ou-org.json', 'w') as f: # Saving in the temporay folder in the lambda
-                  for ou in ou_id_list.keys():
-                      account_data(f, ou, ou_id_list[ou][0], client)
-              s3_upload('ou-org')
-
-              with open('/tmp/acc-org.json', 'w') as f: # Saving in the temporay folder in the lambda
-                  account_data(f, root_id, root_id, client)
-              s3_upload('acc-org')
-
-          def account_data(f, parent, parent_name, client):
-              tags_check = os.environ["TAGS"]
-              account_id_list = get_acc_ids(parent, client)
-              for account_id in account_id_list:
-                  response = client.describe_account(AccountId=account_id)
-                  account  = response["Account"]          
-                  if tags_check != '':
-                      tags_list = list_tags(client, account["Id"]) 
-                      
-                      for tag in os.environ.get("TAGS").split(","): 
-                          for org_tag in tags_list:
-                              if tag == org_tag['Key']:
-                                  value = org_tag['Value']
-                                  kv = {tag : value}
-                                  account.update(kv)
-                  account.update({'Parent' : parent_name})        
-                  data = json.dumps(account, default = myconverter)
-                  f.write(data)
-                  f.write('\n')
-
-          def s3_upload(file_name):
-              bucket = os.environ["BUCKET_NAME"]
-              try:
-                  s3 = boto3.client('s3', os.environ["REGION"], config=Config(s3={'addressing_style': 'path'}))
-                  s3.upload_file(f'/tmp/{file_name}.json', bucket, f"organisation-data/{file_name}.json")
-                  print(f"{file_name}org data in s3")
-              except Exception as e:
-                  print(e)
-
-          def ou_loop(parent_id, test, client):
-              print(parent_id)
-              paginator = client.get_paginator('list_children')
-              iterator = paginator.paginate( ParentId=parent_id, ChildType='ORGANIZATIONAL_UNIT')
-              for page in iterator:
-                  for ou in page['Children']:
-                      test.append(ou['Id'])
-                      ou_loop(ou['Id'], test, client)
-              return test
-
-          def get_ou_ids(parent_id, client):
-              full_result = {}
-              test = []
-              ous = ou_loop(parent_id, test, client)
-              print(ous)
-
-              for ou in ous:
-                  ou_info = client.describe_organizational_unit(OrganizationalUnitId=ou)
-                  full_result[ou]=[]
-                  full_result[ou].append(ou_info['OrganizationalUnit']['Name'])
-              return full_result
-
-          def get_acc_ids(parent_id,  client):
-            full_result = []
-            paginator = client.get_paginator('list_accounts_for_parent')
-            iterator  = paginator.paginate(ParentId=parent_id)
-            for page in iterator:
-              for acc in page['Accounts']:
-                print(acc['Id'])
-                full_result.append(acc['Id'])
-            return full_result
-      Handler: 'index.lambda_handler'
-      MemorySize: 2688
-      Timeout: 300
-      Role: 
-        Fn::GetAtt:
-          - LambdaRole
-          - Arn
-      Environment:
-        Variables:
-          TAGS:
-            Fn::Sub: ${Tags}
-          BUCKET_NAME: !Ref DestinationBucket
-          REGION: !Ref "AWS::Region"
-  OrgCrawler:
-    Type: AWS::Glue::Crawler
-    Properties:
-      Name: Org_Glue_Crawler
-      Role: !GetAtt GlueRole.Arn 
-      DatabaseName: !Ref DatabaseName
-      Schedule:
-        ScheduleExpression: "cron(0 8 ? * MON *)"
-      Targets:
-        S3Targets:
-          - Path: !Sub "s3://${DestinationBucket}/organisation-data/"
-  EventPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt LambdaOrgData.Arn
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !GetAtt CloudWatchTrigger.Arn
-Outputs:
-  S3Bucket:
-    Description: Name of S3 Bucket which will store the AWS Organization Data
-    Value:
-      Ref: S3Bucket
-  S3BucketARN:
-    Description: ARN of S3 Bucket which will store the AWS Organization Data
-    Value:
-       Fn::GetAtt:
-        - S3Bucket
-        - Arn 
-  GlueCrawlerRoleARN:
-    Value:
-      Fn::GetAtt:
-        - GlueRole
-        - Arn
-
diff --git a/static/Operations/100_Dependency_Monitoring/Code/dependency_monitoring.yaml b/static/Operations/100_Dependency_Monitoring/Code/dependency_monitoring.yaml
deleted file mode 100644
index 788f6ee9d..000000000
--- a/static/Operations/100_Dependency_Monitoring/Code/dependency_monitoring.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template to create lab resources. Creates a VPC and
-  subnet, an S3 Bucket, an SNS Topic, an EC2 Instance, and a Lambda Function.
-
-  **WARNING** You will be billed for the AWS resources created if you create a
-  stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License"). You may not
-  use this file except in compliance with the License. A copy of the License is
-  located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed  on
-  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  express or implied. See the License for the specific language governing
-  permissions and limitations under the License.
-Parameters:
-  AvailabilityZone: 
-    Type: 'AWS::EC2::AvailabilityZone::Name'
-    Description: The Availability Zone in which resources are launched.
-  BucketName:
-    Type: String
-    Description: >-
-      A name for the S3 bucket that is created. Note that the namespace for S3
-      buckets is global so the bucket name you enter here has to be globally
-      unique.
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-  NotificationEmail:
-    Type: String
-    Description: The email address to which CloudWatch Alarm notifications are published.
-Resources:
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      Tags:
-        - Key: Name
-          Value: WA-Lab-VPC
-  Subnet:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Ref AvailabilityZone
-      CidrBlock: 10.0.0.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet
-  InternetGateway:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: WA-Lab-InternetGateway
-  VPCGatewayAttachment:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-  RouteTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: WA-Lab-RouteTable
-  Route:
-    Type: 'AWS::EC2::Route'
-    DependsOn: VPCGatewayAttachment
-    Properties:
-      RouteTableId: !Ref RouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-  RouteTableAssociation:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet
-  Instance:
-    Type: 'AWS::EC2::Instance'
-    DependsOn: DataReadFunction
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SubnetId: !Ref Subnet
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              echo "test" >> /home/ec2-user/data.txt
-            - |
-              echo "#!/bin/bash" >> /home/ec2-user/data-write.sh
-            - |
-              echo "while true" >> /home/ec2-user/data-write.sh
-            - |
-              echo "do" >> /home/ec2-user/data-write.sh
-            - 'echo "aws s3api put-object --bucket '
-            - !Ref BucketName
-            - |2
-               --key data.txt --body /home/ec2-user/data.txt" >> /home/ec2-user/data-write.sh
-            - |
-              echo "sleep 50" >> /home/ec2-user/data-write.sh
-            - |
-              echo "done" >> /home/ec2-user/data-write.sh
-            - |
-              chmod +x /home/ec2-user/data-write.sh
-            - |
-              sh /home/ec2-user/data-write.sh &
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Instance
-  InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      InstanceProfileName: WA-Lab-Instance-Profile
-      Roles:
-        - !Ref InstanceRole
-  InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: WA-Lab-InstanceRole
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ec2.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Policies:
-        - PolicyName: S3PutObject
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 's3:PutObject'
-                Resource: !Join
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref BucketName
-                    - /*
-  Bucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      BucketName: !Ref BucketName
-      NotificationConfiguration:
-        LambdaConfigurations:
-          - Event: 's3:ObjectCreated:Put'
-            Function: !GetAtt
-              - DataReadFunction
-              - Arn
-  SNSTopic:
-    Type: 'AWS::SNS::Topic'
-    Properties:
-      TopicName: WA-Lab-Dependency-Notification
-      Subscription:
-        - Endpoint: !Ref NotificationEmail
-          Protocol: email
-  DataReadFunction:
-    Type: 'AWS::Lambda::Function'
-    Properties:
-      FunctionName: WA-Lab-DataReadFunction
-      Handler: index.lambda_handler
-      Role: !GetAtt
-        - DataReadLambdaRole
-        - Arn
-      Runtime: python3.7
-      Code:
-        ZipFile: !Sub |
-          import os
-          import boto3
-
-          def lambda_handler(context, event):
-            s3 = boto3.client('s3')
-            response = s3.delete_object(
-            Bucket='${BucketName}',
-            Key='data.txt'
-            )
-
-            print(response)
-
-            print('success')
-            return "File deleted"
-  OpsItemFunction:
-    Type: 'AWS::Lambda::Function'
-    Properties:
-      FunctionName: WA-Lab-OpsItemFunction
-      Handler: index.lambda_handler
-      Role: !GetAtt
-        - OpsItemLambdaRole
-        - Arn
-      Runtime: python3.7
-      Code:
-        ZipFile: !Sub |
-          import json
-          import boto3
-
-          def lambda_handler(event, context):
-              print(event)
-
-              client = boto3.client('ssm')
-
-              create_opsitem = client.create_ops_item(
-              Description='Datawrite service is failing to write data to S3',
-              OperationalData={
-                  '/aws/resources': {
-                      'Value': '[{\"arn\":\"arn:aws:s3:::${BucketName}\"}]',
-                      'Type': 'SearchableString'
-                  }
-              },
-              Source='Lambda',
-              Category='Availability',
-              Title='S3 Data Writes failing',
-              Severity='2'
-          )
-
-              print(create_opsitem)
-
-              return {
-                  'statusCode': 200,
-                  'body': json.dumps('OpsItem Created!')
-              }
-  DataReadLambdaRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: WA-Lab-DataReadLambdaRole
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
-      Policies:
-        - PolicyName: LambdaPolicy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Sid: VisualEditor0
-                Effect: Allow
-                Action: 's3:DeleteObject'
-                Resource: !Join
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref BucketName
-                    - /*
-  OpsItemLambdaRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: WA-Lab-OpsItemLambdaRole
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
-      Policies:
-        - PolicyName: LambdaPolicy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Sid: VisualEditor0
-                Effect: Allow
-                Action: 'ssm:CreateOpsItem'
-                Resource: '*'
-  DataReadLambdaPermission:
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:InvokeFunction'
-      FunctionName: !Ref DataReadFunction
-      Principal: s3.amazonaws.com
-      SourceAccount: !Ref 'AWS::AccountId'
-      SourceArn: !Join
-        - ''
-        - - 'arn:aws:s3:::'
-          - !Ref BucketName
-Outputs:
-  SNSTopic:
-    Description: The SNS Topic you subscribed to.
-    Value: !Ref SNSTopic
-  DataReadFunction:
-    Description: The Lambda function that gets invoked when an object is uploaded to S3.
-    Value: !Ref DataReadFunction
-  OpsItemFunction:
-    Description: >-
-      The Lambda function that gets invoked when the CloudWatch Alarm is
-      triggered.
-    Value: !GetAtt
-      - OpsItemFunction
-      - Arn
\ No newline at end of file
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/automation_role.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/automation_role.yml
deleted file mode 100644
index daf76a82f..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/automation_role.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Resources:
-  AutomationRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - ssm.amazonaws.com
-            - ec2.amazonaws.com
-          Action: sts:AssumeRole
-      Policies:
-        - PolicyName: PassRole
-          PolicyDocument:
-            Statement:
-              - Effect: Allow
-                Action: 'iam:PassRole'
-                Resource: '*'
-        - PolicyName: SNSPublish
-          PolicyDocument:
-            Statement:
-              - Effect: Allow
-                Action: 'sns:Publish'
-                Resource: '*'                
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AmazonSSMAutomationRole
-        - arn:aws:iam::aws:policy/CloudWatchReadOnlyAccess
-        - arn:aws:iam::aws:policy/CloudWatchLogsReadOnlyAccess
-        - arn:aws:iam::aws:policy/AmazonRDSReadOnlyAccess
-        - arn:aws:iam::aws:policy/AWSCloudFormationReadOnlyAccess
-        - arn:aws:iam::aws:policy/AmazonECS_FullAccess
-        - arn:aws:iam::aws:policy/CloudWatchSyntheticsReadOnlyAccess
-      Path: "/"
-      RoleName: AutomationRole
-      
\ No newline at end of file
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml
deleted file mode 100644
index 7322aee90..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml
+++ /dev/null
@@ -1,568 +0,0 @@
-Parameters:
-  BaselineVpcStack:
-    Type: String
-  ECRImageURI:
-    Type: String
-  SystemOpsNotificationEmail:
-    Type: String
-  SystemOwnerNotificationEmail:
-    Type: String
-
-Outputs:
-  OutputApplicationEndpoint:
-    Description: Application Endpoint
-    Value: !GetAtt ALB.DNSName
-  OutputECSService:
-    Description: App Task ECS Service
-    Value: !GetAtt ECSService.Name
-  OutputECSCluster:
-    Description: App Task ECS Cluster
-    Value: !Ref ECSCluster
-  OutputSystemOwnersTopicArn:
-    Description: Arn of the SNS Topic for System Owners
-    Value: !Ref SystemOwnersTopic    
-  OutputSystemEventTopicArn:
-    Description: Arn of the SNS Topic for System Events
-    Value: !Ref SystemEventTopic        
-  SyntheticsCanaryDurationAlarmArn:
-    Description: Arn CloudWatch Alarm
-    Value: !GetAtt SyntheticsCanaryDurationAlarm.Arn    
-  OutputCanaryResultsBucket:
-    Description: Canary Result Bucket
-    Value: !Ref ResultsBucket
-    
-Resources:
-#----------------------------------------------------------------------------------------
-# Build load balancer.
-#----------------------------------------------------------------------------------------
-  ALB:
-    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
-    Properties:
-      SecurityGroups:
-        - !Ref ELBSecurityGroup
-      Subnets:
-        -
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PublicSubnet1"
-        -
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PublicSubnet2"
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalALB"]]
-        - Key: Application
-          Value: "OpsExcellence-Lab"
-      LoadBalancerAttributes:
-        - Key: idle_timeout.timeout_seconds
-          Value: 30
-      Scheme: internal
-
-  ALBTargetGroup:
-    Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    Properties:
-      TargetType: ip
-      HealthCheckEnabled: True
-      HealthCheckIntervalSeconds: 60
-      HealthCheckPath: /
-      HealthCheckPort: 80
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: 30
-      HealthyThresholdCount: 3
-      UnhealthyThresholdCount: 5
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 0
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      Port: 80
-      Protocol: HTTP
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalALBTargetGroup"]]
-        - Key: Application
-          Value: "OpsExcellence-Lab"
-
-  ALBListener:
-    Type: AWS::ElasticLoadBalancingV2::Listener
-    Properties:
-      LoadBalancerArn: !Ref ALB
-      Port: 80
-      Protocol: HTTP
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref ALBTargetGroup
-
-#----------------------------------------------------------------------------------------
-# Build load balancer security group.
-#----------------------------------------------------------------------------------------
-  ELBSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Enable HTTP from the Internet
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: '0.0.0.0/0'
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalELBSecurityGroup"]]
-      - Key: Application
-        Value: "OpsExcellence-Lab"
-
-#----------------------------------------------------------------------------------------
-# Build ECS Resources.
-#----------------------------------------------------------------------------------------
-
-  ContainerSecGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: !Join ['', [!Ref 'AWS::StackName', -ContainerSecGroup]]
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          SourceSecurityGroupId: !Ref ELBSecurityGroup
-
-  ECSCluster:
-    Type: AWS::ECS::Cluster
-    Properties:
-      ClusterName: mysecretword-cluster
-      CapacityProviders:
-        - FARGATE
-      DefaultCapacityProviderStrategy:
-        - CapacityProvider: FARGATE
-          Weight: 1
-
-  ECSService:
-    DependsOn: ALB
-    Type: AWS::ECS::Service
-    Properties:
-      Cluster: !Ref ECSCluster
-      ServiceName: mysecretword-service
-      DeploymentConfiguration:
-        MaximumPercent: 200
-        MinimumHealthyPercent: 100
-      DesiredCount: 1
-      HealthCheckGracePeriodSeconds: 60
-      LoadBalancers:
-        - ContainerName: mysecretword-app
-          ContainerPort: 80
-          TargetGroupArn: !Ref ALBTargetGroup
-      TaskDefinition: !Ref TaskDefinition
-      LaunchType: FARGATE
-      NetworkConfiguration:
-        AwsvpcConfiguration:
-          AssignPublicIp: ENABLED
-          Subnets:
-            - Fn::ImportValue:
-                !Sub "${BaselineVpcStack}-PrivateSubnet1"
-            - Fn::ImportValue:
-                !Sub "${BaselineVpcStack}-PrivateSubnet2"
-          SecurityGroups:
-            - !Ref ContainerSecGroup
-
-
-  TaskDefinition:
-    Type: AWS::ECS::TaskDefinition
-    Properties:
-      Family: !Join ['', [!Ref 'AWS::StackName', -app]]
-      TaskRoleArn: !Ref ECSTaskRole
-      ExecutionRoleArn: !Ref ECSTaskExecutionRole
-      NetworkMode: awsvpc
-      RequiresCompatibilities:
-        - FARGATE
-      Cpu: 256
-      Memory: 0.5GB
-      ContainerDefinitions:
-      - Name: mysecretword-app
-        Essential: 'true'
-        Image: !Ref ECRImageURI 
-        LogConfiguration:
-          LogDriver: awslogs
-          Options:
-            awslogs-group: !Ref 'ECSCloudWatchLogsGroup'
-            awslogs-region: !Ref 'AWS::Region'
-            awslogs-stream-prefix: !Join ['', [!Ref 'AWS::StackName', -app]]
-        Environment:
-          - Name: DBHOST
-            Value: !GetAtt RDS.Endpoint.Address
-          - Name: KeyId
-            Value: !Ref KMSKey
-          - Name: DBSecret
-            Value: !Ref RDSSecret
-          - Name: REGION
-            Value: !Ref AWS::Region
-        PortMappings:
-        - ContainerPort: 80
-
-
-  ECSCloudWatchLogsGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: !Join ['', [!Ref 'AWS::StackName', -app-loggroup]]
-      RetentionInDays: 365
-
-  #----------------------------------------------------------------------------------------
-  # Build ECS IAM Roles.
-  #----------------------------------------------------------------------------------------
-
-  ECSServiceRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2008-10-17
-        Statement:
-          - Sid: ''
-            Effect: Allow
-            Principal:
-              Service: ecs.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceRole'
-
-  ECSTaskRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Join ['', [!Ref 'AWS::StackName', -ECSTaskRole]]
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ecs-tasks.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Path: /
-      Policies:            
-        - PolicyName: KMSAccess
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: '*'
-                Resource: !GetAtt KMSKey.Arn
-        - PolicyName: SMAccess
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'secretsmanager:GetSecretValue'
-                Resource: '*'            
-        - PolicyName: CloudWatchLogs
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'logs:*'
-                Resource: !GetAtt ECSCloudWatchLogsGroup.Arn        
-        - PolicyName: Xray
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'xray:*'
-                Resource: '*'                    
-        ### This needs to be restricted 
-
-  ECSTaskExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Join ['', [!Ref 'AWS::StackName', -ECSTaskExecutionRole]]
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ecs-tasks.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'
-
-  #----------------------------------------------------------------------------------------
-  # Build RDS Instance.
-  #----------------------------------------------------------------------------------------
-
-  RDS:
-    Type: AWS::RDS::DBInstance
-    Properties:
-      AllocatedStorage: 5
-      DBInstanceClass: db.t3.micro
-      Engine: MySQL
-      MasterUsername: !Join ['', ['{{resolve:secretsmanager:', !Ref RDSSecret, ':SecretString:username}}' ]]
-      MasterUserPassword: !Join ['', ['{{resolve:secretsmanager:', !Ref RDSSecret, ':SecretString:password}}' ]]
-      DBSubnetGroupName: !Ref RDSSubnetGroup
-      VPCSecurityGroups: 
-        - !Ref RDSSecGroup
-      MultiAZ: False
-
-
-  RDSSecGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: !Join ['', [!Ref 'AWS::StackName', -RDSSecGroup]]
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          CidrIp: 
-            Fn::ImportValue:
-              !Sub "${BaselineVpcStack}-VpcCidrBlock"
-
-  RDSSubnetGroup:
-    Type: "AWS::RDS::DBSubnetGroup"
-    Properties:
-      DBSubnetGroupDescription: "Subnet Group"
-      SubnetIds:
-        - Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PrivateSubnet1"
-        - Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PrivateSubnet2"
-
-  RDSSecret:
-    Type: AWS::SecretsManager::Secret
-    Properties:
-      Description: 'This is the secret for my RDS instance'
-      GenerateSecretString:
-        SecretStringTemplate: '{"username": "masteradmin"}'
-        GenerateStringKey: 'password'
-        PasswordLength: 16
-        ExcludeCharacters: '"@/\'
-
-  #----------------------------------------------------------------------------------------
-  # Build Parameter KMS Key
-  #----------------------------------------------------------------------------------------
-
-  KMSKey:
-    Type: "AWS::KMS::Key"
-    Properties:
-      KeyPolicy:
-        Version: 2012-10-17
-        Id: key--1
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS: !Join
-                - ""
-                - - "arn:aws:iam::"
-                  - !Ref "AWS::AccountId"
-                  - ":root"
-            Action: "kms:*"
-            Resource: "*"
-            
-  #----------------------------------------------------------------------------------------
-  # Canary
-  #----------------------------------------------------------------------------------------
-  CloudWatchSyntheticsRole:
-    Type: AWS::IAM::Role
-    Properties:
-      Description: CloudWatch Synthetics lambda execution role for running canaries
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: sts:AssumeRole
-            Condition: {}
-
-  RolePermissions:
-    Type: AWS::IAM::Policy
-    Properties:
-      Roles:
-        - Ref: CloudWatchSyntheticsRole
-      PolicyName: CloudWatchSyntheticsPolicy
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - s3:PutObject
-              - s3:GetBucketLocation
-            Resource:
-              - Fn::Sub: arn:aws:s3:::${ResultsBucket}/*
-          - Effect: Allow
-            Action:
-              - logs:CreateLogStream
-              - logs:PutLogEvents
-              - logs:CreateLogGroup
-            Resource:
-              - '*'
-          - Effect: Allow
-            Action:
-              - s3:ListAllMyBuckets
-            Resource: '*'
-          - Effect: Allow
-            Resource: '*'
-            Action: cloudwatch:PutMetricData
-            Condition:
-              StringEquals:
-                cloudwatch:namespace: CloudWatchSynthetics
-          - Effect: Allow
-            Resource: '*'
-            Action: 
-              - ec2:*            
-
-  ResultsBucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-    DeletionPolicy: Retain          
-
-  CanarySecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Canary Sec Group
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref AWS::StackName, "CanarySecurityGroup"]]
-      - Key: Application
-        Value: "OpsExcellence-Lab"
-
-  SyntheticsCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-        Name: mysecretword-canary
-        ExecutionRoleArn: !GetAtt CloudWatchSyntheticsRole.Arn
-        Code: 
-            Handler: apiCanaryBlueprint.handler
-            Script:  
-                  |
-                    var synthetics = require('Synthetics');
-                    const log = require('SyntheticsLogger');
-                    apiCanaryBlueprint = async function (ms) {
-                    
-                            // Handle validation for positive scenario
-                            const validateSuccessfull = async function(res) {
-                                return new Promise((resolve, reject) => {
-                                    if (res.statusCode < 200 || res.statusCode > 299) {
-                                        throw res.statusCode + ' ' + res.statusMessage;
-                                    }
-                             
-                                    let responseBody = '';
-                                    res.on('data', (d) => {
-                                        responseBody += d;
-                                    });
-                             
-                                    res.on('end', () => {
-                                        // Add validation on 'responseBody' here if required.
-                                        resolve();
-                                    });
-                                });
-                            };
-                            
-
-                            let requestOptionsStep1 = {
-                                hostname: process.env.CANARY_ENDPOINT,
-                                method: 'POST',
-                                path: '/encrypt',
-                                port: '80',
-                                protocol: 'http:',
-                                body: "{\"Name\":\"Test User\",\"Text\":\"This Message is a Test!\"}",
-                                headers: {"Content-Type":"application/json"}
-                            };
-                            requestOptionsStep1['headers']['User-Agent'] = [synthetics.getCanaryUserAgentString(), requestOptionsStep1['headers']['User-Agent']].join(' ');
-    
-                           let stepConfig1 = {
-                                includeRequestHeaders: true,
-                                includeResponseHeaders: true,
-                                includeRequestBody: true,
-                                includeResponseBody: true,
-                                restrictedHeaders: [],
-                                continueOnHttpStepFailure: true
-                            };
-                        
-                            await synthetics.executeHttpStep('Verify', requestOptionsStep1, validateSuccessfull, stepConfig1);
-                    
-                        
-                    };
-                    exports.handler = async () => {
-                        return await apiCanaryBlueprint();
-                    };
-        ArtifactS3Location:
-          Fn::Join:
-            - ''
-            - - s3://
-              - Ref: ResultsBucket
-        RuntimeVersion: syn-nodejs-puppeteer-6.2
-        Schedule: 
-          Expression: 'rate(1 minute)'
-          DurationInSeconds: 0
-        RunConfig: 
-          TimeoutInSeconds: 60
-          EnvironmentVariables: { "CANARY_ENDPOINT" : !GetAtt ALB.DNSName }
-        VPCConfig:
-          SecurityGroupIds: 
-            - !Ref CanarySecurityGroup
-          SubnetIds: 
-            -
-              Fn::ImportValue:
-                !Sub "${BaselineVpcStack}-PrivateSubnet1"
-            -
-              Fn::ImportValue:
-                !Sub "${BaselineVpcStack}-PrivateSubnet2"
-          VpcId: 
-            Fn::ImportValue:
-              !Sub "${BaselineVpcStack}-VpcId"            
-        FailureRetentionPeriod: 30
-        SuccessRetentionPeriod: 30
-        StartCanaryAfterCreation: true
-        Tags:
-          - Key: Name
-            Value: !Join [ "-", [ !Ref AWS::StackName, "Canary"]]
-          - Key: Application
-            Value: "OpsExcellence-Lab"
-          - Key: TargetEndpoint
-            Value: !GetAtt ALB.DNSName                
-        
-  SyntheticsCanaryDurationAlarm:
-    Type: AWS::CloudWatch::Alarm
-    Properties:
-      AlarmDescription: Canary Alarm for My Secret Word
-      AlarmName: mysecretword-canary-duation-alarm
-      AlarmActions:
-        - !Ref SystemEventTopic
-      ComparisonOperator: GreaterThanOrEqualToThreshold 
-      EvaluationPeriods: 12
-      DatapointsToAlarm: 3
-      Dimensions:
-        - Name: CanaryName
-          Value: mysecretword-canary
-        - Name: StepName
-          Value: Verify       
-      Namespace: "CloudWatchSynthetics"
-      MetricName: "Duration"
-      Period: 30
-      Statistic: Average
-      Threshold: 5000
-      TreatMissingData: ignore
-
-  SystemEventTopic:
-    Type: AWS::SNS::Topic
-    Properties: 
-      TopicName: SystemEventTopic
-      Subscription: 
-      - Endpoint: !Ref SystemOpsNotificationEmail
-        Protocol: "Email"
-
-  SystemOwnersTopic:
-    Type: AWS::SNS::Topic
-    Properties: 
-      TopicName: SystemOwnersTopic
-      Subscription: 
-      - Endpoint: !Ref SystemOwnerNotificationEmail
-        Protocol: "Email"
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_resources.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_resources.yml
deleted file mode 100644
index f068a895c..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_resources.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-
-Description: >
-  Well Architected Operational Excellence Lab
-
-Parameters:
-  Cloud9CidrBlock:
-    Description: The CIDR block range for your Cloud9 IDE VPC
-    Type: String
-    Default: 10.43.0.0/28
-  GitRepositoryURL:
-    Description: The Git repository URL for the project we are cloning
-    Type: String
-    Default: https://github.com/awslabs/aws-well-architected-labs.git
-
-
-Resources:
-  #------------------------------------------------------------
-  # Create a VPC with a public and private subnet
-  #------------------------------------------------------------
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 172.31.0.0/16
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-VPC"
-      EnableDnsHostnames: true
-      EnableDnsSupport: true
-
-  PublicSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs ''
-      CidrBlock: 172.31.1.0/24
-      MapPublicIpOnLaunch: true
-  
-  PublicSubnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs ''
-      CidrBlock: 172.31.3.0/24
-      MapPublicIpOnLaunch: true
-
-  PrivateSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs ''
-      CidrBlock: 172.31.2.0/24
-      MapPublicIpOnLaunch: false
-
-  PrivateSubnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref VPC
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs ''
-      CidrBlock: 172.31.4.0/24
-      MapPublicIpOnLaunch: false
-
-  #-------------------------------------------------------------
-  # Create an IGW and attach to the created VPC
-  # Create a NAT GW with an associated public IP address.
-  #------------------------------------------------------------- 
-
-  IGW:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-InternetGateway"
-
-  IGWAttach:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref VPC
-      InternetGatewayId: !Ref IGW
-  
-  NatGateway:
-    Type: "AWS::EC2::NatGateway"
-    DependsOn: NatPublicIP
-    Properties: 
-      AllocationId: !GetAtt NatPublicIP.AllocationId
-      SubnetId: !Ref PublicSubnet1
-
-  NatPublicIP:
-    Type: "AWS::EC2::EIP"
-    DependsOn: VPC
-    Properties:
-      Domain: vpc
-      
-  #-------------------------------------------------------------
-  # Create public route table and attach to the public subnets
-  #-------------------------------------------------------------
-
-  PublicRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-Public-RouteTable1"
-
-  
-  PublicRouteTable2:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: !Sub "${AWS::StackName}-Public-RouteTable2"
-
-  PublicRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - IGW
-      - IGWAttach
-    Properties:
-      RouteTableId: !Ref PublicRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-
-  PublicRoute2:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - IGW
-      - IGWAttach
-    Properties:
-      RouteTableId: !Ref PublicRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-  
-  PublicSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref PublicSubnet1
-      RouteTableId: !Ref PublicRouteTable1
-
-  PublicSubnet1RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref PublicSubnet2
-      RouteTableId: !Ref PublicRouteTable2
-
-  #-------------------------------------------------------------
-  # Create public route table and attach to the public subnets
-  #-------------------------------------------------------------
-
-  PrivateRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-
-  
-  PrivateRouteTable2:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-
-  PrivateRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: IGW
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref NatGateway
-
-  PrivateRoute2:
-    Type: 'AWS::EC2::Route'
-    DependsOn: IGW
-    Properties:
-      RouteTableId: !Ref PrivateRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref NatGateway
-
-  PrivateSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref PrivateSubnet1
-      RouteTableId: !Ref PrivateRouteTable1
-
-  PrivateSubnet1RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref PrivateSubnet2
-      RouteTableId: !Ref PrivateRouteTable2
-
-  # ------------------
-  # ECR Repository
-  # ------------------
-
-  AppContainerRepository: 
-    Type: AWS::ECR::Repository
-    Properties:
-      RepositoryName: walab-ops-sample-application
-
-  Cloud9:
-    Type: AWS::Cloud9::EnvironmentEC2
-    Properties:
-      AutomaticStopTimeMinutes: 30
-      Description: Well Architected Operational Excellence lab workspace
-      InstanceType: t2.small
-      ImageId: amazonlinux-2-x86_64
-      Name: !Sub "WellArchitectedOps-${AWS::StackName}"
-      Repositories:
-        - PathComponent: /aws-well-architected-labs
-          RepositoryUrl: !Ref GitRepositoryURL
-      SubnetId: !Ref PublicSubnet1
-
-Outputs:
-  Cloud9DevEnvUrl:
-    Description: Cloud9 Development Environment
-    Value: !Sub "https://${AWS::Region}.console.aws.amazon.com/cloud9/ide/${Cloud9}"
-
-
-Outputs:
-  OutputVPC:
-    Description: Baseline VPC
-    Value: !Ref VPC
-    Export:
-      Name: !Sub "${AWS::StackName}-VpcId"
-  OutputVPCCidrBlock:
-    Description: Baseline VPC Cidr Block
-    Value: !GetAtt VPC.CidrBlock
-    Export:
-      Name: !Sub "${AWS::StackName}-VpcCidrBlock"      
-  OutputPublicSubnet1:
-    Description: Public Subnet 1 VPC
-    Value: !Ref PublicSubnet1
-    Export:
-      Name: !Sub "${AWS::StackName}-PublicSubnet1"
-  OutputPublicSubnet2:
-    Description: Public Subnet 2 VPC
-    Value: !Ref PublicSubnet2
-    Export:
-      Name: !Sub "${AWS::StackName}-PublicSubnet2"
-  OutputPrivateSubnet1:
-    Description: Private Subnet 1 VPC
-    Value: !Ref PrivateSubnet1
-    Export:
-      Name: !Sub "${AWS::StackName}-PrivateSubnet1"
-  OutputPrivateSubnet2:
-    Description: Private Subnet 2 VPC
-    Value: !Ref PrivateSubnet2
-    Export:
-      Name: !Sub "${AWS::StackName}-PrivateSubnet2"
-  OutputAppContainerRepository:
-    Description: Applicaton ECR Repository
-    Value: !Ref AppContainerRepository
-    Export:
-      Name: !Sub "${AWS::StackName}-AppContainerRepository"
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_gather_resources.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_gather_resources.yml
deleted file mode 100644
index 28b7602a4..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_gather_resources.yml
+++ /dev/null
@@ -1,159 +0,0 @@
-Parameters:
-  PlaybookIAMRole:
-    Type: String
-
-Resources:
-  PlaybookGatherAppResourceAlarm: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Name: Playbook-Gather-Resources
-      Content: 
-        schemaVersion: '0.3'
-        assumeRole: "{{AutomationAssumeRole}}"
-        parameters:
-          AlarmARN:
-            description: (Required) The Alarm ARN triggering incident.
-            type: String
-          AutomationAssumeRole:
-            type: String
-            default: !Ref PlaybookIAMRole
-            description: (Optional) The ARN of the role that allows Automation to perform the actions on your behalf.
-        outputs:
-          - Gather_Resources_For_Alarm.Resources
-        mainSteps:
-        - name: Gather_Resources_For_Alarm
-          action: aws:executeScript
-          description: Gather AWS resources related to the Alarm, based on it's Tag
-          outputs:
-            - Name: Resources
-              Selector: $.Payload.ApplicationStackResources
-              Type: String
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              CloudWatchAlarmARN: '{{AlarmARN}}'
-            Script: |-
-                import json
-                import re
-                from datetime import datetime
-                import boto3
-                import os
-                
-                def arn_deconstruct(arn):
-                  # arn:aws:cloudwatch:us-east-1:754323466686:alarm:mysecretword-canary-alarm
-                  arnlist = arn.split(":")
-                  service=arnlist[2]
-                  region=arnlist[3]
-                  accountid=arnlist[4]
-                  servicetype=arnlist[5]
-                  name=arnlist[6]
-                  
-                  return {
-                    "Service": service,
-                    "Region": region,
-                    "AccountId": accountid,
-                    "Type": servicetype,
-                    "Name": name
-                  }
-                
-                def locate_alarm_source(alarm):
-                  cwclient = boto3.client('cloudwatch', region_name = alarm['Region'] )
-                  alarm_source = {}
-                  alarm_detail = cwclient.describe_alarms(AlarmNames=[alarm['Name']])  
-                  
-                  if len(alarm_detail['MetricAlarms']) > 0:
-                    metric_alarm = alarm_detail['MetricAlarms'][0]
-                    namespace = metric_alarm['Namespace']
-                    
-                    # Condition if NameSpace is CloudWatch Syntetics
-                    if namespace == 'CloudWatchSynthetics':
-                      if 'Dimensions' in metric_alarm:
-                        dimensions = metric_alarm['Dimensions']
-                        for i in dimensions:
-                          if i['Name'] == 'CanaryName':
-                            source_name = i['Value']
-                            alarm_source['Type'] = namespace
-                            alarm_source['Name'] = source_name
-                            alarm_source['Region'] = alarm['Region']
-                            alarm_source['AccountId'] = alarm['AccountId']
-                
-                    result = alarm_source
-                    return result
-                  
-                  # #Condition for CompositeAlarms    
-                  # if len(alarm_detail['CompositeAlarms']) > 0:
-                
-                def locate_canary_endpoint(canaryname,region):
-                  result = None
-                  synclient = boto3.client('synthetics', region_name = region )
-                  res = synclient.get_canary(Name=canaryname)
-                  canary = res['Canary']
-                  if 'Tags' in canary:
-                    if 'TargetEndpoint' in canary['Tags']:
-                      target_endpoint = canary['Tags']['TargetEndpoint']
-                      result = target_endpoint
-                      
-                  return result
-                
-                
-                def locate_app_tag_value(resource):
-                  result = None
-                
-                  if resource['Type'] == 'CloudWatchSynthetics':
-                    synclient = boto3.client('synthetics', region_name = resource['Region'] )
-                    res = synclient.get_canary(Name=resource['Name'])
-                    canary = res['Canary']
-                    if 'Tags' in canary:
-                      if 'Application' in canary['Tags']:
-                        apptag_val = canary['Tags']['Application']
-                        result = apptag_val
-                        
-                  return result
-                
-                def locate_app_resources_by_tag(tag,region):
-                  result = None
-                  
-                  # Search CloufFormation Stacks for tag
-                  cfnclient = boto3.client('cloudformation', region_name = region )
-                  list = cfnclient.list_stacks(StackStatusFilter=['CREATE_COMPLETE','ROLLBACK_COMPLETE','UPDATE_COMPLETE','UPDATE_ROLLBACK_COMPLETE','IMPORT_COMPLETE','IMPORT_ROLLBACK_COMPLETE']  )
-                  for stack in list['StackSummaries']:
-                    app_resources_list = []
-                    stack_name = stack['StackName']
-                    stack_details = cfnclient.describe_stacks(StackName=stack_name)
-                    stack_info = stack_details['Stacks'][0]
-                    if 'Tags' in stack_info:
-                      for t in stack_info['Tags']:
-                        if t['Key'] == 'Application' and t['Value'] == tag:
-                          app_stack_name = stack_info['StackName']
-                          app_resources = cfnclient.describe_stack_resources(StackName=app_stack_name)
-                          for resource in app_resources['StackResources']:
-                            app_resources_list.append(
-                              { 
-                                'PhysicalResourceId' : resource['PhysicalResourceId'],
-                                'Type': resource['ResourceType']
-                              }
-                            )
-                          result =  app_resources_list
-                  
-                  return result
-                def handler(event, context):
-                  result = {}
-                  arn = event['CloudWatchAlarmARN']
-                  alarm = arn_deconstruct(arn)
-                  # Locate tag from CloudWatch Alarm
-                  
-                  
-                  alarm_source = locate_alarm_source(alarm) # Identify Alarm Source
-                  tag_value = locate_app_tag_value(alarm_source) #Identify tag from source
-                  
-                  if alarm_source['Type'] == 'CloudWatchSynthetics':
-                    endpoint = locate_canary_endpoint(alarm_source['Name'],alarm_source['Region'])
-                    result['CanaryEndpoint'] = endpoint
-                    
-                  # Locate cloudformation with tag
-                  resources = locate_app_resources_by_tag(tag_value,alarm['Region'])
-                  result['ApplicationStackResources'] = json.dumps(resources) 
-                  
-                  return result
\ No newline at end of file
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application.yml
deleted file mode 100644
index aca5451b1..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-Parameters:
-  PlaybookIAMRole:
-    Type: String
-    
-Resources:
-  PlaybookInvestigateAlarm: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Name: Playbook-Investigate-Application-From-Alarm
-      Content: 
-        description: |2-
-          # What is does this playbook do?
-
-          This playbook will execute **Playbook-Gather-Resources** to gather Application resources monitored by Canary.
-
-          Then subsequently execute **Playbook-Investigate-Application-Resources** to Investigate the resources for issues. 
-
-          Outputs of the investigation will be sent to SNS Topic Subscriber
-        schemaVersion: '0.3'
-        assumeRole: !Ref PlaybookIAMRole
-        parameters:
-          AlarmARN:
-            type: String
-          SNSTopicARN:
-            type: String
-        mainSteps:
-          - name: gatherResources
-            action: 'aws:executeAutomation'
-            inputs:
-              DocumentName: Playbook-Gather-Resources
-              RuntimeParameters:
-                AlarmARN: '{{AlarmARN}}'
-          - name: investigateAppResources
-            action: 'aws:executeAutomation'
-            inputs:
-              DocumentName: Playbook-Investigate-Application-Resources
-              RuntimeParameters:
-                Resources: '{{gatherResources.Output}}'
-          - name: AWSPublishSNSNotification
-            action: 'aws:executeAutomation'
-            inputs:
-              DocumentName: AWS-PublishSNSNotification
-              RuntimeParameters:
-                TopicArn: '{{SNSTopicARN}}'
-                Message: '{{ investigateAppResources.Output }}'
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application_resources.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application_resources.yml
deleted file mode 100644
index ea3065f81..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/playbook_investigate_application_resources.yml
+++ /dev/null
@@ -1,945 +0,0 @@
-Parameters:
-  PlaybookIAMRole:
-    Type: String
-
-Resources:
-  PlaybookInvestigateAlarm: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Name: Playbook-Investigate-Application-Resources
-      Content: 
-        schemaVersion: '0.3'
-        assumeRole: "{{AutomationAssumeRole}}"
-        parameters:
-          Resources:
-            description: (Required) The Stringified Resources list from Gather Resource Alarm Output.
-            type: String
-          AutomationAssumeRole:
-            type: String
-            default: !Ref PlaybookIAMRole
-            description: (Optional) The ARN of the role that allows Automation to perform the actions on your behalf.
-        outputs:
-          - Inspect_Playbook_Results.Result            
-        mainSteps:
-        - name: Gather_ELB_Statistics
-          action: aws:executeScript
-          description: Gather ELB Statistics
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String           
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              Resourceslist: '{{Resources}}'
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              
-              def arn_deconstruct(arn):
-                arnlist = arn.split(":")
-                
-                service=arnlist[2]
-                region=arnlist[3]
-                accountid=arnlist[4]
-                resources = arnlist[5].split("/")
-                servicetype = resources[0]
-                servicemode = resources[1]
-                resourcename = resources[2]
-                resourceid = resources[3]
-                
-                return {
-                  "Service": service,
-                  "Region": region,
-                  "AccountId": accountid,
-                  "Type": servicetype,
-                  "Mode" : servicemode,
-                  "Name" : resourcename,
-                  "Id" : resourceid
-                }
-              
-              
-              def get_related_metrics(elb):
-                cwclient = boto3.client('cloudwatch', region_name = elb['Region'] )
-                if elb['Mode'] == 'app':
-                  response = cwclient.list_metrics(
-                    Namespace='AWS/ApplicationELB',
-                    Dimensions=[
-                        {
-                            'Name':'LoadBalancer',
-                            'Value': '{}/{}/{}'.format(elb['Mode'],elb['Name'],elb['Id'])
-                        }
-                    ]
-                  )
-                return(response['Metrics']) 
-                
-                
-              def get_stat(elb,metricname,stat):
-                cwclient = boto3.client('cloudwatch', region_name = elb['Region'] )
-                
-                if elb['Mode'] == 'app':
-                  response = cwclient.get_metric_statistics(
-                    Namespace='AWS/ApplicationELB',
-                    MetricName=metricname,
-                    StartTime=datetime.now() - timedelta(minutes=60),
-                    EndTime=datetime.now(),
-                    Period=60,      
-                    Dimensions=[
-                        {
-                            'Name':'LoadBalancer',
-                            'Value': '{}/{}/{}'.format(elb['Mode'],elb['Name'],elb['Id'])
-                        }
-                    ],
-                    Statistics=[stat]
-                  )
-                  
-                x = []  
-                result = {} 
-                if len(response['Datapoints']) > 0:
-                  for i in response['Datapoints']:
-                    x.append(i[stat])
-                    result['OverallValue'] = cal_average(x)
-                else:
-                  result['OverallValue'] = None
-                result['Statistics'] = stat
-                result['TimeWindow'] = 60
-                return(result)
-              
-              def find_elb_resource(res):
-                result = None
-                r = json.loads(res['Resourceslist'])
-                for i in r:
-                  if i['Type'] == 'AWS::ElasticLoadBalancingV2::Listener':
-                    result = i['PhysicalResourceId']
-                return result
-              
-              def cal_average(num):
-                  sum_num = 0
-                  for t in num:
-                      sum_num = sum_num + t           
-              
-                  avg = sum_num / len(num)
-                  return avg
-              
-              def myconverter(o):
-                  if isinstance(o, datetime):
-                      return o.__str__()
-                
-              def handler(event, context):
-                
-                arn = find_elb_resource(event)
-                result = {}  
-                
-                if arn is not None:
-                  elb = arn_deconstruct(arn)
-              
-                  metricslist = get_related_metrics(elb)
-                  result['TargetResponseTime'] = get_stat(elb,'TargetResponseTime','Average')
-                  result['Target2XXCount'] = get_stat(elb,'HTTPCode_Target_2XX_Count','Sum')
-                  result['Target3XXCount'] = get_stat(elb,'HTTPCode_Target_2XX_Count','Sum')
-                  result['Target4XXCount'] = get_stat(elb,'HTTPCode_Target_4XX_Count','Sum')
-                  result['Target5XXCount'] = get_stat(elb,'HTTPCode_Target_5XX_Count','Sum')
-                  result['TargetConnectionErrorCount'] = get_stat(elb,'TargetConnectionErrorCount','Sum')
-                  result['UnHealthyHostCount'] = get_stat(elb,'UnHealthyHostCount','Average')
-                  result['ActiveConnectionCount'] = get_stat(elb,'ActiveConnectionCount','Sum')
-                  result['ELB3XXCount'] = get_stat(elb,'HTTPCode_ELB_3XX_Count','Sum')
-                  result['ELB4XXCount'] = get_stat(elb,'HTTPCode_ELB_4XX_Count','Sum')
-                  result['ELB5XXCount'] = get_stat(elb,'HTTPCode_ELB_5XX_Count','Sum')
-                  result['ELB500Count'] = get_stat(elb,'HTTPCode_ELB_500_Count','Sum')
-                  result['ELB502Count'] = get_stat(elb,'HTTPCode_ELB_502_Count','Sum')
-                  result['ELB503Count'] = get_stat(elb,'HTTPCode_ELB_503_Count','Sum')
-                  result['ELB504Count'] = get_stat(elb,'HTTPCode_ELB_504_Count','Sum')
-                  
-                  serialized_result = json.dumps(result, default = myconverter )
-                  result['Result'] = json.dumps(json.loads(serialized_result))
-              
-                return result
-        - name: Gather_RDS_Config
-          action: aws:executeScript
-          description: Gather RDS Configurations
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String               
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              Resourceslist: '{{Resources}}'
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              
-              def arn_deconstruct(arn):
-                arnlist = arn.split(":")
-                
-                service=arnlist[2]
-                region=arnlist[3]
-                accountid=arnlist[4]
-                resources = arnlist[5].split("/")
-                servicetype = resources[0]
-                servicemode = resources[1]
-                resourcename = resources[2]
-                resourceid = resources[3]
-                
-                return {
-                  "Service": service,
-                  "Region": region,
-                  "AccountId": accountid,
-                  "Type": servicetype,
-                  "Mode" : servicemode,
-                  "Name" : resourcename,
-                  "Id" : resourceid
-                }
-              
-              
-                
-              def get_rds_config(rdsname):
-                  rdsclient = boto3.client('rds')
-                  
-                  res = rdsclient.describe_db_instances(
-                      DBInstanceIdentifier=rdsname
-                  )
-                  result = res['DBInstances'][0]
-                  
-                  return(result)
-              
-              def get_rds_parameters(rdsparamgroups):
-                  result = []
-                  rdsclient = boto3.client('rds')
-                  
-                  for i in rdsparamgroups:
-                    name = i['DBParameterGroupName']
-                    res = rdsclient.describe_db_parameters(
-                      DBParameterGroupName=name
-                    )
-                    x = {
-                      'DBParamGroup' : i,
-                      'Parameters' : res['Parameters']
-                    }
-                    result.append(x)
-                  
-                  return result
-                    
-              
-              def find_rds_resource(res):
-                result = None
-                r = json.loads(res['Resourceslist'])
-                for i in r:
-                  if i['Type'] == 'AWS::RDS::DBInstance':
-                    result = i['PhysicalResourceId']
-                return result
-              
-              def cal_average(num):
-                  sum_num = 0
-                  for t in num:
-                      sum_num = sum_num + t           
-              
-                  avg = sum_num / len(num)
-                  return avg
-              
-              def myconverter(o):
-                  if isinstance(o, datetime):
-                      return o.__str__()
-                
-              def handler(event, context):
-                param = None
-                result = {}
-                
-                rdsrsname = find_rds_resource(event)
-                rdsconfig = get_rds_config(rdsrsname)
-                
-                if len(rdsconfig['DBParameterGroups']) > 0:
-                  param = get_rds_parameters(rdsconfig['DBParameterGroups'])
-
-                result['Result'] = json.dumps({
-                  'config' : json.loads(json.dumps(rdsconfig,default = myconverter)),
-                  'parameters' : param
-                } );
-                
-                return result
-        - name: Gather_RDS_Statistics
-          action: aws:executeScript
-          description: Gather RDS Statistics
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String            
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              Resourceslist: '{{Resources}}'
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              
-              def arn_deconstruct(arn):
-                arnlist = arn.split(":")
-                
-                service=arnlist[2]
-                region=arnlist[3]
-                accountid=arnlist[4]
-                resources = arnlist[5].split("/")
-                servicetype = resources[0]
-                servicemode = resources[1]
-                resourcename = resources[2]
-                resourceid = resources[3]
-                
-                return {
-                  "Service": service,
-                  "Region": region,
-                  "AccountId": accountid,
-                  "Type": servicetype,
-                  "Mode" : servicemode,
-                  "Name" : resourcename,
-                  "Id" : resourceid
-                }
-              
-              
-              def get_related_metrics(rdsname):
-                cwclient = boto3.client('cloudwatch')
-                response = cwclient.list_metrics(
-                  Namespace='AWS/RDS',
-                  Dimensions=[
-                      {
-                          'Name':'DBInstanceIdentifier',
-                          'Value': rdsname
-                      }
-                  ]
-                )
-                return(response['Metrics']) 
-                
-                
-              def get_stat(rdsname,metricname,stat):
-                cwclient = boto3.client('cloudwatch')
-                
-                response = cwclient.get_metric_statistics(
-                  Namespace='AWS/RDS',
-                  MetricName=metricname,
-                  StartTime=datetime.now() - timedelta(minutes=60),
-                  EndTime=datetime.now(),
-                  Period=60,      
-                  Dimensions=[
-                      {
-                          'Name':'DBInstanceIdentifier',
-                          'Value': rdsname
-                      }
-                  ],
-                  Statistics=[stat]
-                )
-                  
-                x = []  
-                result = {} 
-                if len(response['Datapoints']) > 0:
-                  for i in response['Datapoints']:
-                    x.append(i[stat])
-                    result['OverallValue'] = cal_average(x)
-                else:
-                  result['OverallValue'] = None
-                result['Statistics'] = stat
-                result['TimeWindow'] = 60
-                return(result)
-              
-              
-              def find_rds_resource(res):
-                result = None
-                r = json.loads(res['Resourceslist'])
-                for i in r:
-                  if i['Type'] == 'AWS::RDS::DBInstance':
-                    result = i['PhysicalResourceId']
-                return result
-              
-              def cal_average(num):
-                  sum_num = 0
-                  for t in num:
-                      sum_num = sum_num + t           
-              
-                  avg = sum_num / len(num)
-                  return avg
-              
-              def myconverter(o):
-                  if isinstance(o, datetime):
-                      return o.__str__()
-                
-              def handler(event, context):
-                
-                rdsrsname = find_rds_resource(event)
-                metrics = get_related_metrics(rdsrsname)
-                result = {}  
-                output = {}
-                
-                result['BinLogDiskUsage'] = get_stat(rdsrsname,'BinLogDiskUsage','Sum')
-                result['BurstBalance'] = get_stat(rdsrsname,'BurstBalance','Average')
-                result['CPUUtilization'] = get_stat(rdsrsname,'CPUUtilization','Average')
-                result['CPUCreditUsage'] = get_stat(rdsrsname,'CPUCreditUsage','Sum')
-                result['CPUCreditBalance'] = get_stat(rdsrsname,'CPUCreditBalance','Maximum')
-                result['DatabaseConnections'] = get_stat(rdsrsname,'DatabaseConnections','Sum')
-                result['DiskQueueDepth'] = get_stat(rdsrsname,'DiskQueueDepth','Maximum')         
-                result['FailedSQLServerAgentJobsCount'] = get_stat(rdsrsname,'FailedSQLServerAgentJobsCount','Average')
-                result['FreeableMemory'] = get_stat(rdsrsname,'FreeableMemory','Maximum')
-                result['MaximumUsedTransactionIDs'] = get_stat(rdsrsname,'MaximumUsedTransactionIDs','Maximum')
-                result['NetworkReceiveThroughput'] = get_stat(rdsrsname,'NetworkReceiveThroughput','Average')
-                result['NetworkTransmitThroughput'] = get_stat(rdsrsname,'NetworkTransmitThroughput','Average')
-                result['OldestReplicationSlotLag'] = get_stat(rdsrsname,'OldestReplicationSlotLag','Maximum')
-                result['ReadIOPS'] = get_stat(rdsrsname,'ReadIOPS','Average')
-                result['ReadLatency'] = get_stat(rdsrsname,'ReadLatency','Average')
-                result['ReadThroughput'] = get_stat(rdsrsname,'ReadThroughput','Average')
-                result['ReplicaLag'] = get_stat(rdsrsname,'ReplicaLag','Average')
-                result['ReplicationSlotDiskUsage'] = get_stat(rdsrsname,'ReplicationSlotDiskUsage','Maximum')
-                result['SwapUsage'] = get_stat(rdsrsname,'SwapUsage','Maximum')
-                result['TransactionLogsDiskUsage'] = get_stat(rdsrsname,'TransactionLogsDiskUsage','Maximum')
-                result['TransactionLogsGeneration'] = get_stat(rdsrsname,'TransactionLogsGeneration','Average')
-                result['ReplicationSlotDiskUsage'] = get_stat(rdsrsname,'ReplicationSlotDiskUsage','Maximum')
-                result['WriteIOPS'] = get_stat(rdsrsname,'WriteIOPS','Average')
-                result['WriteLatency'] = get_stat(rdsrsname,'WriteLatency','Average')
-                result['WriteThroughput'] = get_stat(rdsrsname,'WriteThroughput','Average')
-                output['Result'] = json.dumps(result)
-                
-                return output
-        - name: Gather_ECS_Statistics
-          action: aws:executeScript
-          description: Gather ECS Service CloudWatch metrics
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String            
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              Resourceslist: '{{Resources}}'
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              
-              def arn_deconstruct(arn):
-                arnlist = arn.split(":")
-                
-                service=arnlist[2]
-                region=arnlist[3]
-                accountid=arnlist[4]
-                resources = arnlist[5].split("/")
-                servicetype = resources[0]
-                clustername = resources[1]
-                servicename = resources[2]
-                
-                return {
-                  "Service": service,
-                  "Region": region,
-                  "AccountId": accountid,
-                  "Type": servicetype,
-                  "ClusterName" : clustername,
-                  "ServiceName" : servicename
-                }
-              
-              
-              def get_related_metrics(res):
-                cwclient = boto3.client('cloudwatch', region_name = res['Region'] )
-              
-                response = cwclient.list_metrics(
-                  Namespace='AWS/ECS',
-                  Dimensions=[
-                      {
-                          'Name':'ServiceName',
-                          'Value': res['ServiceName']
-                      },
-                      {
-                          'Name':'ClusterName',
-                          'Value': res['ClusterName']
-                      }        
-                  ]
-                )
-                return(response['Metrics']) 
-                
-                
-              def get_stat(res,metricname,stat):
-                cwclient = boto3.client('cloudwatch', region_name = res['Region'] )
-                
-                response = cwclient.get_metric_statistics(
-                  Namespace='AWS/ECS',
-                  MetricName=metricname,
-                  StartTime=datetime.now() - timedelta(minutes=6),
-                  EndTime=datetime.now(),
-                  Period=1,      
-                  Dimensions=[
-                      {
-                          'Name':'ServiceName',
-                          'Value': res['ServiceName']
-                      },
-                      {
-                          'Name':'ClusterName',
-                          'Value': res['ClusterName']
-                      }
-                  ],
-                  Statistics=[stat]
-                )
-                
-                x = []  
-                result = {} 
-                if len(response['Datapoints']) > 0:
-                  for i in response['Datapoints']:
-                    x.append(i[stat])
-                  result['OverallValue'] = cal_average(x)
-                else:
-                  result['OverallValue'] = None
-                result['Statistics'] = stat
-                result['TimeWindow'] = 60
-                # result['Datapoints'] = response['Datapoints']
-                return(result)
-              
-              
-              def find_ecsservice_resource(res):
-                result = None
-                r = json.loads(res['Resourceslist'])
-                for i in r:
-                  if i['Type'] == 'AWS::ECS::Service':
-                    result = i['PhysicalResourceId']
-                return result
-              
-              def cal_average(num):
-                  sum_num = 0
-                  for t in num:
-                      sum_num = sum_num + t           
-              
-                  avg = sum_num / len(num)
-                  return avg
-              
-              def myconverter(o):
-                  if isinstance(o, datetime):
-                      return o.__str__()
-                
-              def handler(event, context):
-                
-                arn = find_ecsservice_resource(event)
-                result = {}  
-                
-                if arn is not None:
-                  ecsservice = arn_deconstruct(arn)
-                  result = {}
-                  output = {}
-                  result['CPUUtilization'] = get_stat(ecsservice,'CPUUtilization','Maximum')
-                  result['MemoryUtilization'] = get_stat(ecsservice,'MemoryUtilization','Maximum')
-                  serialized_result = json.dumps(result,default = myconverter )
-                  result = json.loads(serialized_result)
-                  output['Result']=json.dumps(result)
-              
-                result = output
-                
-                return result
-        - name: Gather_ECS_Error_Logs
-          action: aws:executeScript
-          description: Search and gather error in ECS logs
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String             
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              Resourceslist: '{{Resources}}'
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              import time
-              
-              def arn_deconstruct(arn):
-                arnlist = arn.split(":")
-              
-                service=arnlist[2]
-                region=arnlist[3]
-                accountid=arnlist[4]
-                resources = arnlist[5].split("/")
-                servicetype = resources[0]
-                servicemode = resources[1]
-                resourcename = resources[2]
-              
-                return {
-                  "Service": service,
-                  "Region": region,
-                  "AccountId": accountid,
-                  "Type": servicetype,
-                  "Mode" : servicemode,
-                  "Name" : resourcename
-                }
-                
-                
-              def find_ecs_resource(res):
-                result = {}
-              
-                r = json.loads(res['Resourceslist'])
-                for i in r:
-                  if i['Type'] == 'AWS::ECS::Cluster':
-                    result['ECSCluster'] = i['PhysicalResourceId']
-                  if i['Type'] == 'AWS::ECS::Service':
-                    result['ECSService'] = i['PhysicalResourceId']
-              
-                return result
-              
-              def find_ecs_logs(ecsclsname,ecssvcname,region):
-                result = []
-                
-                ecsclient = boto3.client('ecs', region_name = region )
-                ecssvcres = ecsclient.describe_services(
-                  cluster=ecsclsname,
-                  services=[ ecssvcname ]
-                )
-                
-                if len(ecssvcres['services']) > 0:
-                  taskdef = ecssvcres['services'][0]['taskDefinition']
-                  taskdefres = ecsclient.describe_task_definition(
-                    taskDefinition=taskdef
-                  )
-                  
-                  contdef = taskdefres['taskDefinition']['containerDefinitions']
-                  
-                  for i in contdef:
-                    result.append(i['logConfiguration'])
-                  
-                return result
-              
-              
-              def find_error_in_logs(loglist):
-                result = []
-                loggroups = []
-                logsclient = boto3.client('logs')
-                
-                for i in loglist:
-                  options = i['options']
-                  if 'awslogs-group' in options:
-                    loggroups.append(options['awslogs-group'])
-                    now = int(datetime.now().timestamp())
-                      
-                    res = logsclient.start_query( 
-                      logGroupNames=loggroups,
-                      startTime = now - 3000,
-                      endTime = now,
-                      queryString = "fields @message | filter @message like \"Error:\" | limit 5"
-                    )
-              
-                    response = None
-                    while response == None or response['status'] == 'Running':
-                        time.sleep(1)
-                        response = logsclient.get_query_results(
-                            queryId=  res['queryId']
-                        )
-                    
-                    if 'results' in response:
-                      if len(response['results']) > 0:
-                        for i in response['results']:
-                          for x in i:
-                            if x['field'] == '@ptr':
-                              pointer = x['value']
-                          recdetail = logsclient.get_log_record(
-                              logRecordPointer=pointer
-                          )
-                          
-                          result.append(recdetail['logRecord'])
-                          
-                return result
-                
-              
-              def cal_average(num):
-                sum_num = 0
-                for t in num:
-                    sum_num = sum_num + t           
-              
-                avg = sum_num / len(num)
-                return avg
-              
-              def myconverter(o):
-                if isinstance(o, datetime):
-                    return o.__str__()
-              
-              def handler(event, context):
-                result = {}
-                x = []
-                res = find_ecs_resource(event)
-                ecssvc = arn_deconstruct(res['ECSService'])
-                loglist = find_ecs_logs(res['ECSCluster'],ecssvc['Name'],ecssvc['Region'])
-                
-                x = find_error_in_logs(loglist)
-                
-                if len(x) > 0:
-                  result['Result'] = json.dumps(x)
-                else:
-                  result['Result'] = "None"
-                
-                return result
-        - name: Gather_ECS_Config
-          action: aws:executeScript
-          description: Gather ECS Configurations
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String             
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              Resourceslist: '{{Resources}}'
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              
-              
-                            
-              def arn_deconstruct(arn):
-                  arnlist = arn.split(":")
-                  
-                  service=arnlist[2]
-                  region=arnlist[3]
-                  accountid=arnlist[4]
-                  resources = arnlist[5].split("/")
-                  servicetype = resources[0]
-                  clustername = resources[1]
-                  servicename = resources[2]
-                  
-                  return {
-                    "Service": service,
-                    "Region": region,
-                    "AccountId": accountid,
-                    "Type": servicetype,
-                    "ClusterName" : clustername,
-                    "ServiceName" : servicename
-                  }
-              
-              def get_ecs_service_config(res):
-                  ecsclient = boto3.client('ecs')
-                  
-                  response = ecsclient.describe_services(
-                    cluster= res['ClusterName'],
-                    services=[ res['ServiceName'] ]
-                  )
-                  
-                  if len(response['services']) > 0:
-                    result = response['services'][0]
-                  
-                  return(result)
-              
-              def get_scaling_policy(res):
-                  result = []
-                  aaclient = boto3.client('application-autoscaling')
-                  
-                  response = aaclient.describe_scaling_policies(
-                    ServiceNamespace = 'ecs',
-                    ResourceId = 'service/{}/{}'.format(res['ClusterName'],res['ServiceName'])
-                  )
-                  
-                  if len(response['ScalingPolicies']) > 0:
-                    result = response['ScalingPolicies']
-                  
-                  return(result)
-                
-              def find_ecsservice_resource(res):
-                  result = None
-                  r = json.loads(res['Resourceslist'])
-                  for i in r:
-                    if i['Type'] == 'AWS::ECS::Service':
-                      result = i['PhysicalResourceId']
-                  return result
-                
-              def cal_average(num):
-                  sum_num = 0
-                  for t in num:
-                    sum_num = sum_num + t           
-                  
-                  avg = sum_num / len(num)
-                  return avg
-              
-              def myconverter(o):
-                  if isinstance(o, datetime):
-                    return o.__str__()
-                  
-              def handler(event, context):
-              
-                        
-                  arn = find_ecsservice_resource(event)
-                  ecsres = arn_deconstruct(arn)
-                  result = {}
-                  output = {}
-                  
-                  if ecsres is not None:
-                    ecssvccfg = json.dumps(get_ecs_service_config(ecsres),default = myconverter )
-              
-                  result = json.loads(ecssvccfg)
-                  result['scalingpolicies'] = json.loads(json.dumps( get_scaling_policy(ecsres),default = myconverter ))
-              
-                  output['Result'] = json.dumps(result,default = myconverter )
-                  return output            
-        - name: Inspect_Playbook_Results
-          action: aws:executeScript
-          description: Inspect Results
-          outputs:
-            - Name: Result
-              Selector: $.Payload.Result
-              Type: String               
-          inputs:
-            Runtime: python3.6
-            Handler: handler
-            InputPayload:
-              ELBStatistics: '{{Gather_ELB_Statistics.Result}}'
-              RDSConfig: '{{Gather_RDS_Config.Result}}'
-              RDSStatistics: '{{Gather_RDS_Statistics.Result}}'
-              ECSStatistics: '{{Gather_ECS_Statistics.Result}}'
-              ECSErrorLogs: '{{Gather_ECS_Error_Logs.Result}}'  
-              ECSConfig: '{{Gather_ECS_Config.Result}}' 
-            Script: |-
-              import json
-              import re
-              from datetime import datetime,timedelta
-              import boto3
-              import os
-              
-              def inspect_elb_stats(elbstat):
-                
-                result = {}
-                stat = json.loads(elbstat)
-                
-                #Benchmark Max Values
-                TargetResponseTime = 5
-                TargetConnectionErrorCount = 0
-                UnHealthyHostCount = 0
-                ELB5XXCount = 0
-                ELB500Count = 0
-                ELB502Count = 0
-                ELB503Count = 0
-                ELB504Count = 0
-                Target4XXCount = 0
-                Target5XXCount = 0
-                
-                if  stat['TargetResponseTime']['OverallValue'] is not None and stat['TargetResponseTime']['OverallValue'] > TargetResponseTime:
-                    result['TargetResponseTime'] = stat['TargetResponseTime']['OverallValue'] 
-                
-                if  stat['TargetConnectionErrorCount']['OverallValue'] is not None and stat['TargetConnectionErrorCount']['OverallValue'] > TargetConnectionErrorCount:
-                    result['TargetConnectionErrorCount'] = stat['TargetConnectionErrorCount']['OverallValue']
-                    
-                if  stat['UnHealthyHostCount']['OverallValue'] is not None  and stat['UnHealthyHostCount']['OverallValue'] > UnHealthyHostCount  :
-                    result['UnHealthyHostCount'] = stat['UnHealthyHostCount']['OverallValue']
-                    
-                if  stat['ELB5XXCount']['OverallValue'] is not None and stat['ELB5XXCount']['OverallValue'] > ELB5XXCount :
-                    result['ELB5XXCount'] = stat['ELB5XXCount']['OverallValue']
-                    
-                if  stat['ELB500Count']['OverallValue'] is not None and stat['ELB500Count']['OverallValue'] > ELB500Count  :
-                    result['ELB500Count'] = stat['ELB500Count']['OverallValue']
-                    
-                if  stat['ELB502Count']['OverallValue'] is not None and stat['ELB502Count']['OverallValue'] > ELB502Count:
-                    result['ELB502Count'] = stat['ELB502Count']['OverallValue']
-                    
-                if  stat['ELB503Count']['OverallValue'] is not None and stat['ELB503Count']['OverallValue'] > ELB503Count:
-                    result['ELB503Count'] = stat['ELB503Count']['OverallValue']
-                    
-                if  stat['ELB504Count']['OverallValue'] is not None and stat['ELB504Count']['OverallValue'] > ELB504Count:
-                    result['ELB504Count'] = stat['ELB504Count']['OverallValue']        
-                
-                if  stat['Target4XXCount']['OverallValue'] is not None and stat['Target4XXCount']['OverallValue'] > Target4XXCount  :
-                    result['Target4XXCount'] = stat['Target4XXCount']['OverallValue']        
-                
-                if  stat['Target5XXCount']['OverallValue'] is not None and stat['Target5XXCount']['OverallValue'] > Target5XXCount   :
-                    result['Target5XXCount'] = stat['Target5XXCount']['OverallValue']        
-                
-                return result
-              
-              def inspect_rds_stats():
-                #Benchmark Values
-                DatabaseConnections = 150
-              
-              
-              def inspect_ecs_logs(ecslogs):
-                #Benchmark Max Values
-                Count = 0
-              
-                result = []
-                print(ecslogs)
-                
-                if ecslogs is not None:
-                  stat = json.loads(ecslogs)
-                  if len(stat) > 0 :
-                    result = stat
-                
-                return result
-              
-              
-              def inspect_ecs_stats(ecstat):
-                
-                result = {}
-                stat = json.loads(ecstat)
-                
-                #Benchmark Max Values
-                CPUUtilization = 80
-              
-                if stat['CPUUtilization']['OverallValue'] is not None and stat['CPUUtilization']['OverallValue'] > CPUUtilization:
-                    result['CPUUtilization'] = stat['CPUUtilization']['OverallValue'] 
-                
-                return result
-
-              def inspect_ecs_config(ecsconf):
-                
-                result = {}
-                conf = json.loads(ecsconf)
-                
-                if 'runningCount' in conf:
-                  result['TaskRunningCount'] = conf['runningCount'] 
-                
-                if 'desiredCount' in conf:
-                  result['TaskDesiredCount'] = conf['desiredCount'] 
-
-                if 'pendingCount' in conf:
-                  result['TaskPendingCount'] = conf['pendingCount'] 
-
-                if 'launchType' in conf:
-                  result['LaunchType'] = conf['launchType']                                 
-              
-              
-                return result              
-
-              def myconverter(o):
-                  if isinstance(o, datetime):
-                    return o.__str__()
-                                  
-              def handler(event, context):
-              
-                result = {}
-                output = {}
-              
-                elbstat = event['ELBStatistics']
-                output['ELB'] = inspect_elb_stats(elbstat)
-                
-                ecsstat = event['ECSStatistics']
-                ecslogs = event['ECSErrorLogs']
-                ecsconf = event['ECSConfig']
-
-                output['ECS'] = inspect_ecs_stats(ecsstat)
-                output['ECS']['CurrentConfig'] =inspect_ecs_config(ecsconf)
-                
-                
-                if ecslogs != "None":
-                  output['ECS']['Logs'] = inspect_ecs_logs(ecslogs)
-                
-                x = json.dumps(output, default = myconverter )
-                
-                result['Result'] = x
-                
-                
-                return result
\ No newline at end of file
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_approval_gate.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_approval_gate.yml
deleted file mode 100644
index 40eded62a..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_approval_gate.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-Parameters:
-  PlaybookIAMRole:
-    Type: String
-
-Resources:
-  AutomaticApproveWithTimer: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Name: Approval-Timer
-      Content: 
-        schemaVersion: '0.3'
-        assumeRole: !Ref PlaybookIAMRole
-        parameters:
-          AutomationExecutionId:
-            type: String
-          Timer:
-            type: String
-            default: PT10M
-        mainSteps:
-          - name: SleepTimer
-            action: 'aws:sleep'
-            inputs:
-              Duration: '{{Timer}}'
-          - name: ApproveExecution
-            action: 'aws:executeAwsApi'
-            inputs:
-              Api: SendAutomationSignal
-              Service: ssm
-              Payload:
-                Comment: 
-                  - 'Automatic Approved by Automatic-Approval-With-Timer'
-              AutomationExecutionId: '{{AutomationExecutionId}}'
-              SignalType: Approve
-  ApprovalGateWithTimer: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Name: Approval-Gate
-      Content: 
-        schemaVersion: '0.3'
-        assumeRole: !Ref PlaybookIAMRole
-        parameters:        
-          Timer:
-            type: String
-            default: PT10M
-          NotificationTopicArn:
-            type: String
-          NotificationMessage:
-            type: String
-          ApproverArn:
-            type: String
-        outputs:
-          - getApprovalStatus.approvalStatusVariable            
-        mainSteps:
-          - name: executeAutoApproveTimer
-            action: 'aws:executeScript'
-            inputs:
-              Runtime: python3.6
-              Handler: handler
-              InputPayload:
-                AutomationExecutionId: '{{automation:EXECUTION_ID}}'
-                Timer: '{{Timer}}'
-              Script: |-
-                import boto3
-                def handler(event, context):
-                  client = boto3.client('ssm')
-                  response = client.start_automation_execution(
-                      DocumentName='Approval-Timer',
-                      Parameters={
-                          'Timer': [ event['Timer'] ],
-                          'AutomationExecutionId' : [ event['AutomationExecutionId'] ]
-                      }
-                  )
-                  return None
-          - name: ApproveOrDeny
-            action: 'aws:approve'
-            onFailure: Continue
-            isCritical: false
-            inputs:
-              NotificationArn: '{{NotificationTopicArn}}'
-              Message: '{{NotificationMessage}}'
-              MinRequiredApprovals: 1
-              Approvers:
-                - '{{ApproverArn}}'
-                - !Ref PlaybookIAMRole
-          - name: getApprovalStatus
-            action: 'aws:executeAwsApi'
-            maxAttempts: 1
-            inputs:
-              Service: ssm
-              Api: DescribeAutomationStepExecutions
-              AutomationExecutionId: '{{automation:EXECUTION_ID}}'
-              Filters:
-                - Key: StepName
-                  Values:
-                    - requestApproval
-            outputs:
-              - Name: approvalStatusVariable
-                Selector: '$.StepExecutions[0].Outputs.ApprovalStatus[0]'
-                Type: String
-            
\ No newline at end of file
diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_scale_ecs_service.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_scale_ecs_service.yml
deleted file mode 100644
index 45d643eea..000000000
--- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/runbook_scale_ecs_service.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-Parameters:
-  PlaybookIAMRole:
-    Type: String
-
-Resources:
-  ScaleECSWithApproval: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Name: Runbook-ECS-Scale-Up
-      Content: 
-        schemaVersion: '0.3'
-        assumeRole: !Ref PlaybookIAMRole
-        parameters:        
-          ECSClusterName:
-            type: String
-          ECSServiceName:
-            type: String
-          ECSDesiredCount:
-            type: Integer
-          Timer:
-            type: String
-            default: PT10M
-          NotificationTopicArn:
-            type: String
-          NotificationMessage:
-            type: String
-          ApproverArn:
-            type: String      
-        mainSteps:
-          - name: ExecuteApprovalGateWithTimer
-            action: 'aws:executeAutomation'
-            inputs:
-              DocumentName: Approval-Gate
-              RuntimeParameters:
-                Timer: '{{Timer}}'
-                NotificationTopicArn: '{{NotificationTopicArn}}'
-                NotificationMessage: '{{NotificationMessage}}'
-                ApproverArn: '{{ApproverArn}}'
-          - name: UpdateECSServiceDesiredCount
-            action: aws:executeAwsApi
-            inputs:
-              Service: ecs
-              Api: UpdateService
-              service: '{{ECSServiceName}}'
-              forceNewDeployment: true
-              desiredCount: '{{ECSDesiredCount}}'
-              cluster: '{{ECSClusterName}}'
\ No newline at end of file
diff --git a/static/Operations/200_Build_AWS_Health_Aware_Operation_Change_Process/Code/cfn_health_aware_ssm_stack.yaml b/static/Operations/200_Build_AWS_Health_Aware_Operation_Change_Process/Code/cfn_health_aware_ssm_stack.yaml
deleted file mode 100755
index 272145b64..000000000
--- a/static/Operations/200_Build_AWS_Health_Aware_Operation_Change_Process/Code/cfn_health_aware_ssm_stack.yaml
+++ /dev/null
@@ -1,451 +0,0 @@
----
-  AWSTemplateFormatVersion: '2010-09-09'
-  Description: This AWS Cloudformation Template is to launch a demonstration environment to showcase the implementation of AWS health aware operational change process.
-  Parameters:
-    NotificationEmailAddress:
-      Description: This is the email address to receive notifications when the operational change pipeline has been interrupted.
-      AllowedPattern: '[^@]+@[^@]+\.[^@]+'
-      Type: String
-  Resources:
-    EC2Instance:
-      Type: AWS::EC2::Instance
-      Properties:
-        ImageId: ami-02f3f602d23f1659d
-        InstanceType: t2.micro
-        Tags: 
-          - Key: "Name"
-            Value: "well-architected-lab-windows-ec2"
-          - Key: "SSMFleetEnv"
-            Value: "test"
-    SSMChangeTemplateApprovalRole:
-      Type: AWS::IAM::Role
-      Properties:
-        RoleName: SSMChangeTemplateApprovalRole
-        AssumeRolePolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-            - Effect: Allow
-              Principal:
-                AWS: !Sub arn:aws:iam::${AWS::AccountId}:root
-              Action: 'sts:AssumeRole'
-        ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AmazonSSMFullAccess
-    HASSMInstanceProfileRole:
-      Type: AWS::IAM::Role
-      Properties:
-        RoleName: SSMInstanceProfileHealthAwareRole
-        AssumeRolePolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-            - Effect: Allow
-              Principal:
-                Service: ec2.amazonaws.com
-              Action: 'sts:AssumeRole'
-        ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
-    HASSMAutomationRole:
-      Type: AWS::IAM::Role
-      Properties:
-        RoleName: SSMAutomationHealthAwareRole
-        AssumeRolePolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-            - Effect: Allow
-              Principal:
-                Service: ssm.amazonaws.com
-              Action: 'sts:AssumeRole'
-        ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AWSHealthFullAccess
-        - arn:aws:iam::aws:policy/AmazonEC2FullAccess
-        - arn:aws:iam::aws:policy/AmazonSSMFullAccess
-        Policies: 
-          - PolicyName: allow-ssm-to-publish-sns-notification
-            PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 'sns:Publish'
-                  Resource: !Ref 'SNSNotificationTopic'
-          - PolicyName: ssm-automation-iam-passrole-policy
-            PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 'iam:PassRole'
-                  Resource: !Sub arn:aws:iam::${AWS::AccountId}:role/SSMAutomationHealthAwareRole
-    SNSNotificationTopic:
-      Type: AWS::SNS::Topic
-      Properties:
-        TopicName: "ssms-change-process-interruption-notification-sns-topic"
-    SNSEmailSubscription:
-      Type: AWS::SNS::Subscription
-      Properties:
-        TopicArn: !Ref SNSNotificationTopic
-        Endpoint: 
-          Ref: NotificationEmailAddress
-        Protocol: email
-    SMSAutomationHealthAwareRunbook:
-      Type: AWS::SSM::Document
-      Properties: 
-        Content:
-          description: |+
-            ---
-            # Purpose of this SSM Automation Runbook
-            ## 1. Built-in AWS health aware logic
-            ## 2. Avoid operation pipeline to be impacted by active AWS service events
-            ## 
-
-            ## Runbook Workflow
-            >*1. Automation Runbook initiated*
-
-            >*2. Poll AWS Health API* 
-
-            >*3. If there's active AWS Service events, then cancel the workflow, and send SNS notification to admin*
-
-            >*4. If there's no active service events, proceed the operation, e.g. Windows EC2 upgrades*
-            ##
-            [Github: aws-health-aware-ssm-change-management](https://github.com/JerryChenZeyun/aws-health-aware-ssm-change-management)
-
-          schemaVersion: '0.3'
-          assumeRole: {"Fn::GetAtt" : [HASSMAutomationRole, "Arn"] }
-          mainSteps:
-            - name: check_aws_health_status
-              action: 'aws:executeScript'
-              inputs:
-                Runtime: python3.8
-                Handler: script_handler
-                InputPayload:
-                  accountId: '{{global:ACCOUNT_ID}}'
-                Script: |-
-                  import json
-                  import boto3
-                  from botocore.config import Config
-
-                  def script_handler(events, context):
-                    ## Get the current region
-                    my_session = boto3.session.Session()
-                    my_region = my_session.region_name
-                    print("The current region is:", my_region)
-                    
-                    ## Initiate boto3 client
-                    config = Config(
-                      retries = dict(
-                        max_attempts = 10 # org view apis have a lower tps than the single
-                                          # account apis so we need to use larger
-                                          # backoff/retry values than than the boto defaults
-                        )
-                    )
-                    client = boto3.client('health', 'us-east-1', config=config)
-                    print("boto3 client initiation succeeded.")
-                      
-                    ## Fetch health event status
-                    response = client.describe_events(
-                      filter={
-                        'regions': [my_region],
-                        'eventTypeCategories': [
-                          'issue'
-                        ],
-                        'eventStatusCodes': [
-                          'open'
-                          ##,'upcoming'
-                          ##'closed'
-                        ]
-                      }    
-                    )
-                    print("health events have been fetched: ", type(response))
-                    print("Event status is: ", response["events"])
-
-                    ## determine if there's any active ('open') events, so that the operation pipeline will be delayed or suspended.
-                    if(len(response["events"]) != 0):
-                      serviceEventStatus = "Active-Service-Event-Exists"
-                      ## Extract service event data into a list
-                      service_list = ''
-                      for event in response["events"]:
-                        service_list = service_list + event['service'] +', '
-                      print("service_list is: ", service_list)
-                      print("service_list type is: ", type(service_list))
-                      
-                      serviceEventData = "There's active AWS service event(s) impacting the region, hence the AWS Systems Manager operation change process has been suspended.\n" + "Impacted Service(s): " + service_list + "Please look into the runbook execution logs."
-                      print(serviceEventData)
-                      
-
-                      ## SNS notify the admin re the service issue before suspending the operational activities.
-                      # Get the account ID
-                      sts = boto3.client('sts')
-                      AWS_ACCOUNT_ID = sts.get_caller_identity()["Account"]
-
-                      # Get the region info   
-                      my_session = boto3.session.Session()
-                      my_region = my_session.region_name
-
-                      # Generate the sns Topic ARN based on the Topic Name
-                      client = boto3.client('sns')
-                      snsTopicArn = "arn:aws:sns:" + my_region + ":" + AWS_ACCOUNT_ID + ":ssms-change-process-interruption-notification-sns-topic"
-                      print("sns ARN is: ", snsTopicArn)
-                      
-                      response = client.publish(
-                        TopicArn = snsTopicArn,
-                        Message = serviceEventData,
-                        Subject = "SSM Operation Change Process has been suspended due to active AWS service event(s)"
-                      )
-                      
-                    else:
-                      serviceEventStatus = "NO-Active-Service-Event"
-                      serviceEventData = "NO-Active-Service-Event"
-                      print(serviceEventData)
-                    
-                    return {'message': serviceEventStatus}
-                    
-                    
-              description: Poll AWS Health API to check if there's active AWS service events
-              outputs:
-                - Name: serviceEventStatus
-                  Selector: $.Payload.message
-                  Type: String
-              nextStep: workflow_control_based_on_service_event_status
-            - name: workflow_control_based_on_service_event_status
-              action: 'aws:branch'
-              onFailure: Abort
-              inputs:
-                Choices:
-                  - Variable: '{{check_aws_health_status.serviceEventStatus}}'
-                    StringEquals: NO-Active-Service-Event
-                    NextStep: option2_execute_planned_operation_activity
-                  - Variable: '{{check_aws_health_status.serviceEventStatus}}'
-                    StringEquals: Active-Service-Event-Exists
-                    NextStep: option1_suspend_the_change_workflow
-            - name: option1_suspend_the_change_workflow
-              action: 'aws:sleep'
-              inputs:
-                Duration: PT5S
-              isEnd: true
-              description: |-
-                **There's active service events**
-
-                Suspended the automation runbook.
-            - name: option2_execute_planned_operation_activity
-              action: 'aws:executeScript'
-              inputs:
-                Runtime: python3.8
-                Handler: script_handler
-                Script: |-
-                  import boto3
-
-                  def script_handler(events, context):
-                    ec2 = boto3.client('ec2', region_name='us-east-1')
-                    a = ec2.describe_instances(Filters=[{'Name':'tag:SSMFleetEnv', 'Values':['test']}])
-                    print ("a is: ", a)
-                    print ("type of a is: ", type(a))
-
-                    b = a['Reservations']
-                    print ("b is: ", b)
-                    print ("type of b is: ", type(b))
-
-                    for c in b:
-                      inst = c['Instances']
-            
-                      for d in inst:
-                        instid = d['InstanceId']
-                        instrun = d['State']['Name']
-              
-                        if instrun == 'running':
-                          ec2.stop_instances(InstanceIds=[instid])
-                          print("The instance is stopped:" + instid)
-                        else:
-                          print("The instance in stop state:" + instid)
-
-                    return {'message': 'Hello'}
-
-              isEnd: true
-              description: |-
-                **There's NO active service event:**
-
-                Conduct the planned operational change process as there's NO existed active AWS service event. In this case it's to stop the EC2 instance with **SSMFleetEnv** tag value set to be **test**.
-        DocumentFormat: YAML
-        DocumentType: Automation
-        Name: AWS_health_aware_normal_operation_runbook
-      DependsOn:
-      - HASSMInstanceProfileRole
-      - HASSMAutomationRole
-    SMSAutomationHealthAwareRunbookSimulatedEvents:
-      Type: AWS::SSM::Document
-      Properties: 
-        Content:
-          description: |+
-            ---
-            # Purpose of this SSM Automation Runbook
-            ## 1. Built-in AWS health aware logic
-            ## 2. Avoid operation pipeline to be impacted by active AWS service events
-            ## 3. Simulate the service event senario using the historical event data
-
-            ## Runbook Workflow
-            >*1. Automation Runbook initiated*
-
-            >*2. Poll AWS Health API* 
-
-            >*3. If there's active AWS Service events, then cancel the workflow, and send SNS notification to admin*
-
-            >*4. If there's no active service events, proceed the operation, e.g. Windows EC2 upgrades*
-            ##
-            [Github: aws-health-aware-ssm-change-management](https://github.com/JerryChenZeyun/aws-health-aware-ssm-change-management)
-
-          schemaVersion: '0.3'
-          assumeRole: {"Fn::GetAtt" : [HASSMAutomationRole, "Arn"] }
-          mainSteps:
-            - name: check_aws_health_status
-              action: 'aws:executeScript'
-              inputs:
-                Runtime: python3.8
-                Handler: script_handler
-                InputPayload:
-                  accountId: '{{global:ACCOUNT_ID}}'
-                Script: |-
-                  import json
-                  import boto3
-                  from botocore.config import Config
-
-                  def script_handler(events, context):
-                    ## Get the current region
-                    my_session = boto3.session.Session()
-                    my_region = my_session.region_name
-                    print("The current region is:", my_region)
-                    
-                    ## Initiate boto3 client
-                    config = Config(
-                      retries = dict(
-                        max_attempts = 10 # org view apis have a lower tps than the single
-                                          # account apis so we need to use larger
-                                          # backoff/retry values than than the boto defaults
-                        )
-                    )
-                    client = boto3.client('health', 'us-east-1', config=config)
-                    print("boto3 client initiation succeeded.")
-                      
-                    ## Fetch health event status
-                    response = client.describe_events(
-                      filter={
-                        'regions': [my_region],
-                        'eventTypeCategories': [
-                          'issue'
-                        ],
-                        'eventStatusCodes': [
-                          ##'open'
-                          ##,'upcoming'
-                          'closed'
-                        ]
-                      }    
-                    )
-                    print("health events have been fetched: ", type(response))
-                    print("Event status is: ", response["events"])
-
-                    ## determine if there's any active ('open') events, so that the operation pipeline will be delayed or suspended.
-                    if(len(response["events"]) != 0):
-                      serviceEventStatus = "Active-Service-Event-Exists"
-                      ## Extract service event data into a list
-                      service_list = ''
-                      for event in response["events"]:
-                        service_list = service_list + event['service'] +', '
-                      print("service_list is: ", service_list)
-                      print("service_list type is: ", type(service_list))
-                      
-                      serviceEventData = "There's active AWS service event(s) impacting the region, hence the AWS Systems Manager operation change process has been suspended.\n" + "Impacted Service(s): " + service_list + "Please look into the runbook execution logs."
-                      print(serviceEventData)
-                      
-
-                      ## SNS notify the admin re the service issue before suspending the operational activities.
-                      # Get the account ID
-                      sts = boto3.client('sts')
-                      AWS_ACCOUNT_ID = sts.get_caller_identity()["Account"]
-
-                      # Get the region info   
-                      my_session = boto3.session.Session()
-                      my_region = my_session.region_name
-
-                      # Generate the sns Topic ARN based on the Topic Name
-                      client = boto3.client('sns')
-                      snsTopicArn = "arn:aws:sns:" + my_region + ":" + AWS_ACCOUNT_ID + ":ssms-change-process-interruption-notification-sns-topic"
-                      print("sns ARN is: ", snsTopicArn)
-                      
-                      response = client.publish(
-                        TopicArn = snsTopicArn,
-                        Message = serviceEventData,
-                        Subject = "SSM Operation Change Process has been suspended due to active AWS service event(s)"
-                      )
-                      
-                    else:
-                      serviceEventStatus = "NO-Active-Service-Event"
-                      serviceEventData = "NO-Active-Service-Event"
-                      print(serviceEventData)
-                    
-                    return {'message': serviceEventStatus}
-                    
-              description: Poll AWS Health API to check if there's active AWS service events
-              outputs:
-                - Name: serviceEventStatus
-                  Selector: $.Payload.message
-                  Type: String
-              nextStep: workflow_control_based_on_service_event_status
-            - name: workflow_control_based_on_service_event_status
-              action: 'aws:branch'
-              onFailure: Abort
-              inputs:
-                Choices:
-                  - Variable: '{{check_aws_health_status.serviceEventStatus}}'
-                    StringEquals: NO-Active-Service-Event
-                    NextStep: option2_execute_planned_operation_activity
-                  - Variable: '{{check_aws_health_status.serviceEventStatus}}'
-                    StringEquals: Active-Service-Event-Exists
-                    NextStep: option1_suspend_the_change_workflow
-            - name: option1_suspend_the_change_workflow
-              action: 'aws:sleep'
-              inputs:
-                Duration: PT5S
-              isEnd: true
-              description: |-
-                **There's active service events**
-
-                Suspended the automation runbook.
-            - name: option2_execute_planned_operation_activity
-              action: 'aws:executeScript'
-              inputs:
-                Runtime: python3.8
-                Handler: script_handler
-                Script: |-
-                  import boto3
-
-                  def script_handler(events, context):
-                    ec2 = boto3.client('ec2', region_name='us-east-1')
-                    a = ec2.describe_instances(Filters=[{'Name':'tag:SSMFleetEnv', 'Values':['test']}])
-                    print ("a is: ", a)
-                    print ("type of a is: ", type(a))
-
-                    b = a['Reservations']
-                    print ("b is: ", b)
-                    print ("type of b is: ", type(b))
-
-                    for c in b:
-                      inst = c['Instances']
-            
-                      for d in inst:
-                        instid = d['InstanceId']
-                        instrun = d['State']['Name']
-              
-                        if instrun == 'running':
-                          ec2.stop_instances(InstanceIds=[instid])
-                          print("The instance is stopped:" + instid)
-                        else:
-                          print("The instance in stop state:" + instid)
-
-                    return {'message': 'Hello'}
-
-              isEnd: true
-              description: |-
-                **There's NO active service event:**
-
-                Conduct the planned operational change process as there's NO existed active AWS service event. In this case it's to stop the EC2 instance with **SSMFleetEnv** tag value set to be **test**.
-        DocumentFormat: YAML
-        DocumentType: Automation
-        Name: AWS_health_aware_event_simulated_runbook
-      DependsOn:
-      - HASSMInstanceProfileRole
-      - HASSMAutomationRole
diff --git a/static/Performance/100_Clock_Source_Performance/Code/time_test.yaml b/static/Performance/100_Clock_Source_Performance/Code/time_test.yaml
deleted file mode 100644
index 990de3e62..000000000
--- a/static/Performance/100_Clock_Source_Performance/Code/time_test.yaml
+++ /dev/null
@@ -1,295 +0,0 @@
----
-AWSTemplateFormatVersion: 2010-09-09
-Description: "Time test of various EC2 instances"
-
-Parameters:
-  XenNodeInstanceType:
-    Description: Xen based EC2 instance type for test
-    Type: String
-    Default: m4.large
-    ConstraintDescription: Must be a valid Xen EC2 instance type
-    AllowedValues:
-      - t2.nano
-      - t2.micro
-      - t2.small
-      - t2.medium
-      - t2.large
-      - t2.xlarge
-      - t2.2xlarge
-      - m4.large
-      - m4.xlarge
-      - m4.2xlarge
-      - m4.4xlarge
-
-  KVMNodeInstanceType:
-    Description: KVM based EC2 instance type for test
-    Type: String
-    Default: m5.large
-    ConstraintDescription: Must be a valid KVM EC2 instance type
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t3.medium
-      - t3.large
-      - t3.xlarge
-      - t3.2xlarge
-      - m5.large
-      - m5.xlarge
-      - m5.2xlarge
-      - m5.4xlarge
-
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2'
-  KeyName:
-    Description: The EC2 Key Pair to allow SSH access to the instances
-    Type: AWS::EC2::KeyPair::KeyName
-  Ec2InstanceSubnetId:
-    Description: ID of the existing subnet to use for the time test server.
-    Type: AWS::EC2::Subnet::Id
-
-Resources:
-  # IAM Role to enable Cloudwatch Logs as well as SSM access for the test.
-  TestMachineIAMRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub '${AWS::StackName}-TestMachineIAMRole-${AWS::Region}'
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-        Version: '2012-10-17'
-      Path: /
-  TestMachineInstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      InstanceProfileName: !Sub '${AWS::StackName}-TestMachineInstanceProfile-${AWS::Region}'
-      Path: /
-      Roles:
-        - !Ref 'TestMachineIAMRole'
-
-
-  # This will create a Xen based EC2 instances with SSM installed by default
-  XenTestInstance:
-    Type: AWS::EC2::Instance
-    Metadata:
-      AWS::CloudFormation::Init:
-        SetupTimeTest:
-          files:
-            /tmp/time_test.py:
-              content: |
-                  #!/usr/bin/python3
-                  import time
-
-                  _gettimeofday = None
-                  def gettimeofday():
-                  	import ctypes
-                  	global _gettimeofday
-
-                  	if not _gettimeofday:
-                  		_gettimeofday = ctypes.cdll.LoadLibrary("libc.so.6").gettimeofday
-
-                  	class timeval(ctypes.Structure):
-                  		_fields_ = \
-                  		[
-                  			("tv_sec", ctypes.c_long),
-                  			("tv_usec", ctypes.c_long)
-                  		]
-
-                  	tv = timeval()
-
-                  	_gettimeofday(ctypes.byref(tv), None)
-
-                  	return float(tv.tv_sec) + (float(tv.tv_usec) / 1000000)
-
-
-                  start_time = time.time()
-
-                  for x in range(0,1000000):
-                      gettimeofday()
-
-                  print("--- %s seconds ---" % (time.time() - start_time))
-
-                  print("Done")
-
-              group: ec2-user
-              mode: '000744'
-              owner: ec2-user
-          packages:
-            yum:
-              python36:
-                - ''
-              strace:
-                - ''
-              amazon-ssm-agent:
-                - ''
-          services:
-            sysvinit:
-              amazon-ssm-agent:
-                enabled: 'true'
-                ensureRunning: 'true'
-        configSets:
-          Install:
-            - SetupTimeTest
-    Properties:
-      ImageId: !Ref 'LatestAmiId'
-      InstanceType: !Ref 'XenNodeInstanceType'
-      IamInstanceProfile: !Ref 'TestMachineInstanceProfile'
-      KeyName: !Ref 'KeyName'
-      SubnetId: !Ref 'Ec2InstanceSubnetId'
-      UserData:
-        Fn::Base64: !Sub
-              |
-                #!/bin/bash
-                set -o xtrace
-                export PATH=$PATH:/usr/local/bin
-                yum update
-                yum install -y amazon-ssm-agent
-                pip install awscli --upgrade
-                /opt/aws/bin/cfn-init -v --stack ${AWS::StackName} --configsets Install --resource XenTestInstance --region ${AWS::Region}
-                export AWS_DEFAULT_REGION=${AWS::Region}
-                /opt/aws/bin/cfn-signal --exit-code $? \
-                         --stack  ${AWS::StackName} \
-                         --resource NodeLaunchConfig  \
-                         --region ${AWS::Region}
-
-                echo "DONE"
-
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}/XenTimeInstanceTest'
-
-  # This will create a Nitro/KVM based EC2 instances with SSM installed by default
-  KVMTestInstance:
-    Type: AWS::EC2::Instance
-    Metadata:
-      AWS::CloudFormation::Init:
-        SetupTimeTest:
-          files:
-            /tmp/time_test.py:
-              content: |
-                  #!/usr/bin/python3
-                  import time
-
-                  _gettimeofday = None
-                  def gettimeofday():
-                  	import ctypes
-                  	global _gettimeofday
-
-                  	if not _gettimeofday:
-                  		_gettimeofday = ctypes.cdll.LoadLibrary("libc.so.6").gettimeofday
-
-                  	class timeval(ctypes.Structure):
-                  		_fields_ = \
-                  		[
-                  			("tv_sec", ctypes.c_long),
-                  			("tv_usec", ctypes.c_long)
-                  		]
-
-                  	tv = timeval()
-
-                  	_gettimeofday(ctypes.byref(tv), None)
-
-                  	return float(tv.tv_sec) + (float(tv.tv_usec) / 1000000)
-
-
-                  start_time = time.time()
-
-                  for x in range(0,1000000):
-                      gettimeofday()
-
-                  print("--- %s seconds ---" % (time.time() - start_time))
-
-                  print("Done")
-
-              group: ec2-user
-              mode: '000744'
-              owner: ec2-user
-          packages:
-            yum:
-              python36:
-                - ''
-              strace:
-                - ''
-              amazon-ssm-agent:
-                - ''
-          services:
-            sysvinit:
-              amazon-ssm-agent:
-                enabled: 'true'
-                ensureRunning: 'true'
-        configSets:
-          Install:
-            - SetupTimeTest
-    Properties:
-      ImageId: !Ref 'LatestAmiId'
-      InstanceType: !Ref 'KVMNodeInstanceType'
-      IamInstanceProfile: !Ref 'TestMachineInstanceProfile'
-      KeyName: !Ref 'KeyName'
-      SubnetId: !Ref 'Ec2InstanceSubnetId'
-      UserData:
-        Fn::Base64: !Sub
-              |
-                #!/bin/bash
-                set -o xtrace
-                export PATH=$PATH:/usr/local/bin
-                yum update
-                yum install -y amazon-ssm-agent
-                pip install awscli --upgrade
-                /opt/aws/bin/cfn-init -v --stack ${AWS::StackName} --configsets Install --resource XenTestInstance --region ${AWS::Region}
-                export AWS_DEFAULT_REGION=${AWS::Region}
-                /opt/aws/bin/cfn-signal --exit-code $? \
-                         --stack  ${AWS::StackName} \
-                         --resource NodeLaunchConfig  \
-                         --region ${AWS::Region}
-
-                echo "DONE"
-
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}/KVMTimeInstanceTest'
-
-  # This SSM document will set the timesource to TSC for increased performance on a Xen node
-  setTSCdocument:
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: "Command"
-      Content:
-        schemaVersion: '2.2'
-        description: "Set TimeSource to TSC SSM Document"
-        parameters: {}
-        mainSteps:
-        - action: aws:runShellScript
-          name: configureServer
-          inputs:
-            runCommand:
-            - echo "tsc" > /sys/devices/system/clocksource/clocksource0/current_clocksource
-
-  # This SSM document will run the test Python script deployed on the EC2 instance
-  runTestScriptdocument:
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: "Command"
-      Content:
-        schemaVersion: '2.2'
-        description: "Run test script Document"
-        parameters: {}
-        mainSteps:
-        - action: aws:runShellScript
-          name: runTestScript
-          inputs:
-            runCommand:
-            - strace -c python3 /tmp/time_test.py
-
-# Notes:
-# To set the timesource for the machine while it is running
-# echo "tsc" > /sys/devices/system/clocksource/clocksource0/current_clocksource
-# To set the timesource for the machine during boot, you can do the following:
-#   echo "echo "tsc" > /sys/devices/system/clocksource/clocksource0/current_clocksource" >> /etc/init.d/after.local
diff --git a/static/Performance/100_Monitoring_Linux_EC2_CloudWatch/Code/LinuxMachineDeploy.yaml b/static/Performance/100_Monitoring_Linux_EC2_CloudWatch/Code/LinuxMachineDeploy.yaml
deleted file mode 100644
index 148014eb4..000000000
--- a/static/Performance/100_Monitoring_Linux_EC2_CloudWatch/Code/LinuxMachineDeploy.yaml
+++ /dev/null
@@ -1,296 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Cloudwatch Amazon Linux Test platform'
-
-Parameters:
-  # KeyName:
-  #   Description: Name of an existing EC2 KeyPair to enable SSH access to the instance
-  #   Type: AWS::EC2::KeyPair::KeyName
-  #   ConstraintDescription: must be the name of an existing EC2 KeyPair.
-  InstanceType:
-    Description: EC2 instance type
-    Type: String
-    Default: t3.large
-    ConstraintDescription: must be a valid EC2 instance type.
-
-  InstanceAMI:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    #Default: '/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2' #AL1
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2' #AL2
-  PrimaryNodeLabel:
-    Type: String
-    Default: "walabs-primary"
-  MetricAggregationInterval:
-    Description: How often we should collect agent data from the machine
-    Type: Number
-    Default: 10
-  MetricCollectionInterval:
-    Description: How often we should collect agent data from the machine
-    Type: Number
-    Default: 5
-  CloudWatchNameSpace:
-    Description: Namespace for CloudWatch metrics to be placed into
-    Type: String
-    Default: "PerfLab"
-  #Imports:
-  VPCImportName:
-    Type: String
-    Description: 'The CloudFormation name of the VPC stack to import'
-    Default: 'PerfLab-VPC'
-    MinLength: '3'
-    MaxLength: '32'
-
-Resources:
-
-  ServerRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - ec2.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      ManagedPolicyArns:
-      - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM
-      - arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy
-
-  ServerRoleInstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Path: /
-      Roles:
-      - !Ref 'ServerRole'
-
-  EC2Instance:
-    Type: AWS::EC2::Instance
-    CreationPolicy:
-      ResourceSignal:
-        Count: 1
-        Timeout: "PT45M"
-    Metadata:
-      AWS::CloudFormation::Init:
-        configSets:
-          default:
-            - 01_setupCfnHup
-            - 02_config-amazon-cloudwatch-agent
-            - 03_restart_amazon-cloudwatch-agent
-          UpdateEnvironment:
-            - 02_config-amazon-cloudwatch-agent
-            - 03_restart_amazon-cloudwatch-agent
-        # Definition of json configuration of AmazonCloudWatchAgent, you can change the configuration below.
-        02_config-amazon-cloudwatch-agent:
-          files:
-            '/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json':
-              content: !Sub |
-                {
-                  "agent": {
-                    "metrics_collection_interval": ${MetricCollectionInterval},
-                    "logfile": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log"
-                  },
-                  "metrics": {
-                    "namespace": "${CloudWatchNameSpace}",
-                    "metrics_collected": {
-                      "cpu": {
-                        "resources": [
-                          "*"
-                        ],
-                        "measurement": [{
-                            "name": "cpu_usage_idle",
-                            "unit": "Percent"
-                          },
-                          {
-                            "name": "cpu_usage_nice",
-                            "unit": "Percent"
-                          },
-                          {
-                            "name": "cpu_usage_user",
-                            "unit": "Percent"
-                          }
-                        ],
-                        "totalcpu": false,
-                        "metrics_collection_interval": ${MetricCollectionInterval}
-                      },
-                      "disk": {
-                        "resources": [
-                          "/",
-                          "/tmp"
-                        ],
-                        "measurement": [{
-                            "name": "free",
-                            "rename": "DISK_FREE",
-                            "unit": "Gigabytes"
-                          },
-                          "total",
-                          "used"
-                        ],
-                        "ignore_file_system_types": [
-                          "sysfs", "devtmpfs"
-                        ],
-                        "metrics_collection_interval": ${MetricCollectionInterval}
-                      },
-                      "mem": {
-                        "measurement": [
-                          "mem_used",
-                          "mem_cached",
-                          "mem_total"
-                        ],
-                        "metrics_collection_interval": ${MetricCollectionInterval}
-                      },
-                      "processes": {
-                        "measurement": [
-                          "running",
-                          "sleeping",
-                          "dead"
-                        ]
-                      }
-                    },
-                    "append_dimensions": {
-                      "ImageId": "${!aws:ImageId}",
-                      "InstanceId": "${!aws:InstanceId}",
-                      "InstanceType": "${!aws:InstanceType}",
-                      "AutoScalingGroupName": "${!aws:AutoScalingGroupName}"
-                    },
-                    "aggregation_dimensions": [
-                      ["ImageId"],
-                      ["InstanceId", "InstanceType"],
-                      ["d1"],
-                      []
-                    ],
-                    "force_flush_interval": ${MetricAggregationInterval}
-                  },
-                  "logs": {
-                    "logs_collected": {
-                      "files": {
-                        "collect_list": [{
-                            "file_path": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/amazon-cloudwatch-agent.log",
-                            "timezone": "UTC"
-                          },
-                          {
-                            "file_path": "/var/log/cfn-init.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/cfn-init.log",
-                            "timezone": "UTC"
-                          },
-                          {
-                            "file_path": "/var/log/cfn-init-cmd.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/cfn-init-cmd.log",
-                            "timezone": "UTC"
-                          },
-                          {
-                            "file_path": "/var/log/cloud-init.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/cloud-init.log",
-                            "timezone": "UTC"
-                          },
-                          {
-                            "file_path": "/var/log/cloud-init-output.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/cloud-init-output.log",
-                            "timezone": "UTC"
-                          },
-                          {
-                            "file_path": "/var/log/messages.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/messages.log",
-                            "timezone": "UTC"
-                          },
-                          {
-                            "file_path": "/var/log/amazon/ssm/amazon-ssm-agent.log",
-                            "log_group_name": "${LogGroup}",
-                            "log_stream_name": "{instance_id}/amazon-ssm-agent.log",
-                            "timezone": "UTC"
-                          }
-                        ]
-                      }
-                    },
-                    "force_flush_interval": ${MetricAggregationInterval}
-                  }
-                }
-        # Invoke amazon-cloudwatch-agent-ctl to restart the AmazonCloudWatchAgent.
-        03_restart_amazon-cloudwatch-agent:
-          commands:
-            01_stop_service:
-              command: /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a stop
-            02_start_service:
-              command: /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s
-        # Cfn-hup setting, it is to monitor the change of metadata.
-        # When there is change in the contents of json file in the metadata section, cfn-hup will call cfn-init to restart the AmazonCloudWatchAgent.
-        01_setupCfnHup:
-          files:
-             '/etc/cfn/cfn-hup.conf':
-               content: !Sub |
-                 [main]
-                 stack=${AWS::StackId}
-                 region=${AWS::Region}
-                 interval=1
-               mode: '000400'
-               owner: root
-               group: root
-             '/etc/cfn/hooks.d/amazon-cloudwatch-agent-auto-reloader.conf':
-               content: !Sub |
-                 [cfn-auto-reloader-hook]
-                 triggers=post.update
-                 path=Resources.EC2Instance.Metadata.AWS::CloudFormation::Init.02_config-amazon-cloudwatch-agent
-                 action=/opt/aws/bin/cfn-init -v --stack ${AWS::StackId} --resource EC2Instance --region ${AWS::Region} --configsets UpdateEnvironment
-                 runas=root
-               mode: '000400'
-               owner: root
-               group: root
-             "/lib/systemd/system/cfn-hup.service":
-                content: !Sub |
-                  [Unit]
-                  Description=cfn-hup daemon
-                  [Service]
-                  Type=simple
-                  ExecStart=/opt/aws/bin/cfn-hup
-                  Restart=always
-                  [Install]
-                  WantedBy=multi-user.target
-          commands:
-            01enable_cfn_hup:
-              command: !Sub |
-                systemctl enable cfn-hup.service
-            02start_cfn_hup:
-              command: !Sub |
-                systemctl start cfn-hup.service
-
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-PrimaryStressMachine-${AWS::Region}'
-        - Key: LabNodeLabel
-          Value: !Ref PrimaryNodeLabel
-      InstanceType: !Ref InstanceType
-      IamInstanceProfile: !Ref ServerRoleInstanceProfile
-      # KeyName:
-      #   Ref: KeyName
-      ImageId: !Ref InstanceAMI
-      Monitoring: True
-      SubnetId:
-        Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet1'
-      UserData:
-        # This script below is to install AmazonCloudWatchAgent, restart AmazonCloudWatchAgent and tell the result to cloudformation.
-        Fn::Base64: !Sub |
-           #!/bin/bash
-           set -o xtrace
-           # Add amazon-linux-extras to our repo list
-           amazon-linux-extras install epel -y
-           # Update to latest versions from the repos
-           yum update -y
-           # Install stress utility and the amazon cloudwatch agent
-           yum install stress amazon-cloudwatch-agent -y
-           # Trigger the cfn-init section above under metadata
-           /opt/aws/bin/cfn-init -v --stack ${AWS::StackId} --resource EC2Instance --region ${AWS::Region} --configsets default
-           /opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackId} --resource EC2Instance --region ${AWS::Region}
-
-  LogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      RetentionInDays: 7
diff --git a/static/Performance/100_Monitoring_Windows_EC2_CloudWatch/Code/WindowsMachineDeploy.yaml b/static/Performance/100_Monitoring_Windows_EC2_CloudWatch/Code/WindowsMachineDeploy.yaml
deleted file mode 100644
index d99647c8c..000000000
--- a/static/Performance/100_Monitoring_Windows_EC2_CloudWatch/Code/WindowsMachineDeploy.yaml
+++ /dev/null
@@ -1,569 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Cloudwatch Windows Test platform'
-
-
-Parameters:
-  InstanceType:
-    Description: EC2 instance type
-    Type: String
-    Default: t3.large
-    ConstraintDescription: must be a valid EC2 instance type.
-  InstanceAMI:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    # Default: '/aws/service/ami-windows-latest/Windows_Server-2016-English-Full-Base' #2016
-    Default: '/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-Base'
-  PrimaryNodeLabel:
-    Type: String
-    Default: "walabs-primary"
-
-  MetricAggregationInterval:
-    Description: How often we should collect agent data from the machine
-    Type: Number
-    Default: 10
-  MetricCollectionInterval:
-    Description: How often we should collect agent data from the machine
-    Type: Number
-    Default: 5
-# If you wanted to run this lab without using SSM, you could enable these two parameters and un-remark them below as well
-  # KeyPair:
-  #   Description: Name of an existing EC2 KeyPair to enable RDP access to the instances
-  #   Type: AWS::EC2::KeyPair::KeyName
-  #   ConstraintDescription: must be the name of an existing EC2 KeyPair.
-  # RDPLocation:
-  #   Description: The IP address range that can be used to RDP to the EC2 instances
-  #   Type: String
-  #   MinLength: '9'
-  #   MaxLength: '18'
-  #   Default:  0.0.0.0/0
-  #   AllowedPattern: (\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})
-  #   ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-  #Imports:
-  VPCImportName:
-    Type: String
-    Description: 'The CloudFormation name of the VPC stack to import'
-    Default: 'PerfLab-VPC'
-    MinLength: '3'
-    MaxLength: '32'
-
-Resources:
-  ServerSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-      GroupDescription: Allow outbound for instance
-      # SecurityGroupIngress:
-      # - IpProtocol: tcp
-      #   FromPort: 3389
-      #   ToPort: 3389
-      #   CidrIp: !Ref 'RDPLocation'
-
-  ServerRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - ec2.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      ManagedPolicyArns:
-      - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM
-      - arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy
-
-  ServerRoleInstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Path: /
-      Roles:
-      - !Ref 'ServerRole'
-
-  TestServerHost:
-    Type: AWS::EC2::Instance
-    CreationPolicy:
-      ResourceSignal:
-        Timeout: PT25M
-    Metadata:
-      AWS::CloudFormation::Init:
-        configSets:
-          config:
-          - 00-ConfigureCWLogs
-          - 01a-ConfigureCWAgentMetrics
-          - 01b-RestartCWAgent
-          - 02-ConfigureLoadTest
-          - 03-Finalize
-        00-ConfigureCWLogs:
-          files:
-            C:\Program Files\Amazon\SSM\Plugins\awsCloudWatch\AWS.EC2.Windows.CloudWatch.json:
-              content: !Sub |
-                {
-                  "EngineConfiguration": {
-                      "Components": [
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.EventLog.EventLogInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "ApplicationEventLog",
-                              "Parameters": {
-                                  "Levels": "7",
-                                  "LogName": "Application"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.EventLog.EventLogInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "SystemEventLog",
-                              "Parameters": {
-                                  "Levels": "7",
-                                  "LogName": "System"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.EventLog.EventLogInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "SecurityEventLog",
-                              "Parameters": {
-                                  "Levels": "7",
-                                  "LogName": "Security"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CustomLog.CustomLogInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "EC2ConfigLog",
-                              "Parameters": {
-                                  "CultureName": "en-US",
-                                  "Encoding": "ASCII",
-                                  "Filter": "EC2ConfigLog.txt",
-                                  "LogDirectoryPath": "C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs",
-                                  "TimeZoneKind": "UTC",
-                                  "TimestampFormat": "yyyy-MM-ddTHH:mm:ss.fffZ:"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CustomLog.CustomLogInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CfnInitLog",
-                              "Parameters": {
-                                  "CultureName": "en-US",
-                                  "Encoding": "ASCII",
-                                  "Filter": "cfn-init.log",
-                                  "LogDirectoryPath": "C:\\cfn\\log",
-                                  "TimeZoneKind": "Local",
-                                  "TimestampFormat": "yyyy-MM-dd HH:mm:ss,fff"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CustomLog.CustomLogInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "IISLogs",
-                              "Parameters": {
-                                  "CultureName": "en-US",
-                                  "Encoding": "UTF-8",
-                                  "Filter": "",
-                                  "LineCount": "3",
-                                  "LogDirectoryPath": "C:\\inetpub\\logs\\LogFiles\\W3SVC1",
-                                  "TimeZoneKind": "UTC",
-                                  "TimestampFormat": "yyyy-MM-dd HH:mm:ss"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.PerformanceCounterComponent.PerformanceCounterInputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "MemoryPerformanceCounter",
-                              "Parameters": {
-                                  "CategoryName": "Memory",
-                                  "CounterName": "Available MBytes",
-                                  "DimensionName": "",
-                                  "DimensionValue": "",
-                                  "InstanceName": "",
-                                  "MetricName": "Memory",
-                                  "Unit": "Megabytes"
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatchLogsOutput,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatchApplicationEventLog",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "LogGroup": "${LogGroup}",
-                                  "LogStream": "{instance_id}/ApplicationEventLog",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatchLogsOutput,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatchSystemEventLog",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "LogGroup": "${LogGroup}",
-                                  "LogStream": "{instance_id}/SystemEventLog",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatchLogsOutput,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatchSecurityEventLog",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "LogGroup": "${LogGroup}",
-                                  "LogStream": "{instance_id}/SecurityEventLog",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatchLogsOutput,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatchEC2ConfigLog",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "LogGroup": "${LogGroup}",
-                                  "LogStream": "{instance_id}/EC2ConfigLog",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatchLogsOutput,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatchCfnInitLog",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "LogGroup": "${LogGroup}",
-                                  "LogStream": "{instance_id}/CfnInitLog",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatchLogsOutput,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatchIISLogs",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "LogGroup": "${LogGroup}",
-                                  "LogStream": "{instance_id}/IISLogs",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          },
-                          {
-                              "FullName": "AWS.EC2.Windows.CloudWatch.CloudWatch.CloudWatchOutputComponent,AWS.EC2.Windows.CloudWatch",
-                              "Id": "CloudWatch",
-                              "Parameters": {
-                                  "AccessKey": "",
-                                  "NameSpace": "Windows/Default",
-                                  "Region": "${AWS::Region}",
-                                  "SecretKey": ""
-                              }
-                          }
-                      ],
-                      "Flows": {
-                          "Flows": [
-                              "ApplicationEventLog,CloudWatchApplicationEventLog",
-                              "SystemEventLog,CloudWatchSystemEventLog",
-                              "SecurityEventLog,CloudWatchSecurityEventLog",
-                              "EC2ConfigLog,CloudWatchEC2ConfigLog",
-                              "CfnInitLog,CloudWatchCfnInitLog",
-                              "IISLogs,CloudWatchIISLogs",
-                              "MemoryPerformanceCounter,CloudWatch"
-                          ]
-                      },
-                      "PollInterval": "00:00:05"
-                  },
-                  "IsEnabled": true
-                }
-          commands:
-            0-enableSSM:
-              command: powershell.exe -Command "Set-Service -Name AmazonSSMAgent -StartupType Automatic"
-              waitAfterCompletion: 0
-            1-restartSSM:
-              command: powershell.exe -Command "Restart-Service AmazonSSMAgent"
-              waitAfterCompletion: 30
-        01a-ConfigureCWAgentMetrics:
-          files:
-            "C:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\amazon-cloudwatch-agent.json":
-              content: !Sub |
-                {
-                        "metrics": {
-                                "append_dimensions": {
-                                        "AutoScalingGroupName": "${!aws:AutoScalingGroupName}",
-                                        "ImageId": "${!aws:ImageId}",
-                                        "InstanceId": "${!aws:InstanceId}",
-                                        "InstanceType": "${!aws:InstanceType}"
-                                },
-                                "aggregation_dimensions" : [["AutoScalingGroupName"],["ImageId"], ["InstanceId", "InstanceType"]],
-                                "metrics_collected": {
-                                        "LogicalDisk": {
-                                                "measurement": [
-                                                        "% Free Space"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "Memory": {
-                                                "measurement": [
-                                                        "% Committed Bytes In Use",
-                                                        "Available Mbytes"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "Paging File": {
-                                                "measurement": [
-                                                        "% Usage"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "PhysicalDisk": {
-                                                "measurement": [
-                                                        "% Disk Time",
-                                                        "Disk Write Bytes/sec",
-                                                        "Disk Read Bytes/sec",
-                                                        "Disk Writes/sec",
-                                                        "Disk Reads/sec"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "Processor": {
-                                                "measurement": [
-                                                        "% User Time",
-                                                        "% Idle Time",
-                                                        "% Interrupt Time"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "TCPv4": {
-                                                "measurement": [
-                                                        "Connections Established"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "TCPv6": {
-                                                "measurement": [
-                                                        "Connections Established"
-                                                ],
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "resources": [
-                                                        "*"
-                                                ]
-                                        },
-                                        "statsd": {
-                                                "metrics_aggregation_interval": ${MetricAggregationInterval},
-                                                "metrics_collection_interval": ${MetricCollectionInterval},
-                                                "service_address": ":8125"
-                                        }
-                                }
-                        }
-                }
-        01b-RestartCWAgent:
-          commands:
-            01_stop_service:
-              command: powershell -Command "C:\\'Program Files'\\Amazon\\AmazonCloudWatchAgent\\amazon-cloudwatch-agent-ctl.ps1 -a stop"
-            02_start_service:
-              command: powershell -Command "C:\\'Program Files'\\Amazon\\AmazonCloudWatchAgent\\amazon-cloudwatch-agent-ctl.ps1 -a fetch-config -m ec2 -c file:C:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\amazon-cloudwatch-agent.json -s"
-        02-ConfigureLoadTest:
-          files:
-            "c:\\mem_stress.ps1":
-              content: |
-                  <#
-                  .EXAMPLE
-                  .\mem_stress.ps1
-
-                  This will execute the script to consume all of the memory (less 512 for the OS to survive)
-
-                  .DESCRIPTION
-                  #>
-
-                  # RAM in box
-                  $box=get-WMIobject Win32_ComputerSystem
-                  $Global:physMB=$box.TotalPhysicalMemory / 1024 /1024
-
-                  # Create object to get current memory available
-                  $Global:psPerfMEM = new-object System.Diagnostics.PerformanceCounter("Memory","Available Mbytes")
-                  $psPerfMEM.NextValue() | Out-Null
-
-                  # leave 512Mb for the OS to survive.
-                  $HEADROOM=512
-
-                  $ram = $physMB - $psPerfMEM.NextValue()
-                  $maxRAM=$physMB - $HEADROOM
-
-                  $progress = ($ram / $maxRAM) * 100
-                  $completed  = [int]$progress
-                  $StartDate = Get-Date
-
-                  Write-Output "=-=-=-=-=-=-=-=-=-=  Memory Stress Started: $StartDate =-=-=-=-=-=-=-=-=-="
-                  Write-Output "mem_stress - This script will consume all but 512MB of RAM available on the machine"
-                  Write-Output "Starting consumed RAM: $ram out of $maxRAM ($completed% Full)"
-                  Write-Output "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-                  # If you increase the size of the array the GC seems to do quicker cleanups
-                  # Not sure why, but 200MB seems to be the suite spot
-                  $a = "a" * 200MB
-
-                  # These are the arrays we will create to consume all of the RAM
-                  $growArray = @()
-                  $growArray += $a
-                  $bigArray = @()
-                  $k=0
-                  $lastCompleted = 900
-
-                  # This loop will continue until we have consumed all of the RAM minus the headroom
-                  while ($ram -lt $maxRAM) {
-                   $bigArray += ,@($k,$growArray)
-                   $k += 1
-                   $growArray += $a
-                   # Find out how much RAM we are now consuming
-                   $ram = $physMB - $psPerfMEM.NextValue()
-                   $progress = ($ram / $maxRAM) * 100
-                   $completed  = [int]$progress
-                   $status_string = -join([int]$ram," of ",[int]$maxRAM, "MB ($completed% Complete)")
-                   # Only show the message when we have a change in percentage
-                   if ($completed -ne $lastCompleted) {
-                      Write-Output "$status_string"
-                      $lastCompleted = $completed
-                      }
-                  }
-                  Write-Output "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-                  # Do a final check of RAM after consuming it all
-                  $ram = $physMB - $psPerfMEM.NextValue()
-                  Write-Output "FINAL $ram / $maxRAM"
-
-                  # Ask the user if they want to clear out RAM, if so we will continue
-                  Read-Host -Prompt "Press ENTER to clear out RAM"
-
-                  Write-Output "Clearing RAM"
-                  #####################
-                  # and now release it all.
-                  $bigArray.clear()
-                  #remove-variable bigArray
-                  $growArray.clear()
-                  #remove-variable growArray
-                  [System.GC]::Collect()
-                  #####################
-
-                  $ram = $physMB - $psPerfMEM.NextValue()
-                  Write-Output "RAM HAS BEEN CLEARED: $ram / $maxRAM"
-            "c:\\cpu_stress.ps1":
-               content: |
-                  <#
-                  .EXAMPLE
-                  .\cpu_stress.ps1
-
-                  This will execute the script against all cores
-
-                  .DESCRIPTION
-                  #>
-
-                  # CPUs in the machine
-                  $cpus=$env:NUMBER_OF_PROCESSORS
-                  # Lower the thread so it won't overwhelm the system for other things
-                  [System.Threading.Thread]::CurrentThread.Priority = 'Lowest'
-
-
-                  #####################
-                  # perfmon counters for CPU
-                  $Global:psPerfCPU = new-object System.Diagnostics.PerformanceCounter("Processor","% Processor Time","_Total")
-                  $psPerfCPU.NextValue() | Out-Null
-
-
-                  $StartDate = Get-Date
-                  Write-Output "=-=-=-=-=-=-=-=-=-=  Stress Machine Started: $StartDate =-=-=-=-=-=-=-=-=-="
-                  Write-Warning "This script will saturate all available CPUs in the machine"
-                  Write-Warning "To cancel execution of all jobs, close the PowerShell Host Window (or terminate the remote session)"
-                  Write-Output "=-=-=-=-=-=-=-=-=-=  CPUs in box: $cpus =-=-=-=-=-=-=-=-=-= "
-
-
-
-                  # This will stress the CPU
-                  foreach ($loopnumber in 1..$cpus){
-                    Start-Job -ScriptBlock{
-                    $result = 1
-                        foreach ($number in 1..0x7FFFFFFF){
-                            $result = $result * $number
-                        }# end foreach
-                    }# end Start-Job
-                  }# end foreach
-
-                  Write-Output "Created sub-jobs to consume the CPU"
-                  # Ask the user if they want to clear out the jobs, if so we will continue
-                  Read-Host -Prompt "Press ENTER to stop the JOBs"
-
-                  Write-Output "Clearing CPU Jobs"
-                  Receive-Job *
-                  Stop-Job *
-                  Remove-Job *
-
-                  $EndDate = Get-Date
-                  Write-Output "=-=-=-=-=-=-=-=-=-= Stress Machine Complete: $EndDate =-=-=-=-=-=-=-=-=-="
-
-        03-Finalize:
-          commands:
-            00_signal_success:
-              command: !Sub 'cfn-signal.exe -e 0 --resource TestServerHost --stack ${AWS::StackName} --region ${AWS::Region}'
-              waitAfterCompletion: '0'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-PrimaryStressMachine-${AWS::Region}'
-        - Key: LabNodeLabel
-          Value: !Ref PrimaryNodeLabel
-      # KeyName: !Ref 'KeyPair'
-      ImageId: !Ref InstanceAMI
-      InstanceType: !Ref InstanceType
-      SecurityGroupIds:
-         - !Ref 'ServerSecurityGroup'
-      IamInstanceProfile: !Ref 'ServerRoleInstanceProfile'
-      Monitoring: True
-      SubnetId:
-        Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet1'
-        # Fn::ImportValue: !Sub '${VPCImportName}-Shared1Subnet1'
-      UserData:
-        Fn::Base64:
-         !Sub |
-          <powershell>
-           echo "Start install of cloudwatch agent"
-           Start-Process msiexec.exe -Wait -ArgumentList '/passive /qn /i https://s3.amazonaws.com/amazoncloudwatch-agent/windows/amd64/latest/amazon-cloudwatch-agent.msi'
-           echo "Start install of AWS CLI v2"
-           Start-Process msiexec.exe -Wait -ArgumentList '/passive /qn /i https://awscli.amazonaws.com/AWSCLIV2.msi'
-
-           echo "Installing Choco"
-           Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-           echo "Installing vim, nano, python from Choco"
-           choco install vim nano python -y
-
-           echo "Initialize disks"
-           & 'C:\ProgramData\Amazon\EC2-Windows\Launch\Scripts\InitializeDisks.ps1'
-           echo "Grab some files"
-           Invoke-WebRequest -Uri 'https://live.sysinternals.com/Testlimit.exe' -OutFile c:\Testlimit.exe
-           Invoke-WebRequest -Uri 'https://live.sysinternals.com/cpustres.exe' -OutFile c:\cpustres.exe
-
-           echo "setting CFN INIT"
-           cfn-init.exe --verbose --configsets=config --stack=${AWS::StackName} --resource TestServerHost --region ${AWS::Region}
-
-          </powershell>
-
-  LogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      RetentionInDays: 7
-
-Outputs:
-  InstanceId:
-    Description: The instance ID of the web server
-    Value: !Ref 'TestServerHost'
-  CloudWatchLogGroupName:
-    Description: The name of the CloudWatch log group
-    Value: !Ref 'LogGroup'
diff --git a/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-data.yaml b/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-data.yaml
deleted file mode 100644
index e857a7c59..000000000
--- a/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-data.yaml
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-# 
-#     https://www.apache.org/licenses/LICENSE-2.0
-# 
-# or in the "license" file accompanying this file. This file is distributed 
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-# express or implied. See the License for the specific language governing 
-# permissions and limitations under the License.
-
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Data stores for backup/restore strategy'
-
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: General
-        Parameters:
-          - ProjectName
-          - BackupBucketName
-          - InventoryBucketName
-      - Label:
-          default: AWS Glue Catalog Configuration
-        Parameters:
-          - DbName
-          - DbTableRaw
-          - DbTableNightly
-          - DbTableInventory
-          - DbTableInventoryNightly
-
-Parameters:
-  InventoryBucketName:
-    Description: S3 bucket for inventory
-    Type: String
-    MinLength: 3
-    MaxLength: 64
-    AllowedPattern: '^([a-z]|(\d(?!\d{0,2}\.\d{1,3}\.\d{1,3}\.\d{1,3})))([a-z\d]|(\.(?!(\.|-)))|(-(?!\.))){1,61}[a-z\d\.]$'
-    ConstraintDescription: >
-      Must begin with a letter and only alphanumeric characters or hyphens.
-      Cannot end in a hyphen or period.'
-  BackupBucketName:
-    Type: String
-    Description: >
-      Name for the S3 bucket used for replication.
-    MinLength: 3
-    MaxLength: 64
-    AllowedPattern: '^([a-z]|(\d(?!\d{0,2}\.\d{1,3}\.\d{1,3}\.\d{1,3})))([a-z\d]|(\.(?!(\.|-)))|(-(?!\.))){1,61}[a-z\d\.]$'
-    ConstraintDescription: >
-      Must begin with a letter and only alphanumeric characters or hyphens.
-      Cannot end in a hyphen or period.'
-  DbName:
-    Description: Glue database name
-    Type:  String
-    Default: "backuprestoredb"
-  DbTableRaw:
-    Description: Glue table name for raw input
-    Type:  String
-    Default: "rawdata"
-  DbTableInventory:
-    Description: Glue table name for backup bucket inventory
-    Type:  String
-    Default: "inventory"
-  DbTableInventoryNightly:
-    Description: Glue table name for backup bucket inventory
-    Type:  String
-    Default: "inventory_compacted"
-  DbTableNightly:
-    Description: Glue table name for nightly compacted table
-    Type:  String
-    Default: "compacteddata"
-  ProjectName:
-    Description: Tagging identifier
-    Type: String
-    Default: "BackupRestoreAnalytics"
-
-Resources:
-  InventoryBucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Ref InventoryBucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-        - ServerSideEncryptionByDefault:
-            SSEAlgorithm: AES256  
-      VersioningConfiguration:
-        Status: Enabled  
-  InventoryBucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref InventoryBucket
-      PolicyDocument:
-        Statement:
-          - Effect: "Allow"
-            Principal:
-              Service: "s3.amazonaws.com"
-            Action:
-            - 's3:PutObject'
-            Resource: !Sub "arn:aws:s3:::${InventoryBucket}/*"
-            Condition:
-              ArnLike:
-                "aws:SourceArn": !Sub "arn:aws:s3:::${BackupBucketName}"
-              StringEquals:
-                "aws:SourceAccount": !Ref AWS::AccountId
-                "s3:x-amz-acl": "bucket-owner-full-control"
-
-  BackupBucket:
-    DependsOn: InventoryBucketPolicy
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Ref BackupBucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-        - ServerSideEncryptionByDefault:
-            SSEAlgorithm: AES256     
-      VersioningConfiguration:
-        Status: Enabled
-      NotificationConfiguration:
-        LambdaConfigurations:
-          - 
-            Event: "s3:ObjectCreated:*"
-            Filter:
-              S3Key:
-                Rules:
-                  - 
-                    Name: prefix
-                    Value: "raw/"
-            Function: !GetAtt PartitionFn.Arn
-      InventoryConfigurations:
-        - Id: BackupInventoryRaw
-          Destination:
-            BucketArn: !GetAtt InventoryBucket.Arn
-            Format: CSV
-            Prefix: "inventory/raw"
-            BucketAccountId: !Ref AWS::AccountId
-          Enabled: true
-          IncludedObjectVersions: Current
-          Prefix: "raw/"
-          ScheduleFrequency: Daily
-          OptionalFields: 
-            - ReplicationStatus
-        - Id: BackupInventoryNightly
-          Destination:
-            BucketArn: !GetAtt InventoryBucket.Arn
-            Format: CSV
-            Prefix: "inventory/nightly"
-            BucketAccountId: !Ref AWS::AccountId
-          Enabled: true
-          IncludedObjectVersions: Current
-          Prefix: "nightly/"
-          ScheduleFrequency: Daily
-          OptionalFields: 
-            - ReplicationStatus
-
-  GlueDB:
-    Type: "AWS::Glue::Database"
-    Properties:
-      DatabaseInput:
-        Name: !Ref DbName
-      CatalogId: !Ref AWS::AccountId
-  GlueTable:
-    Type: "AWS::Glue::Table"
-    Properties:
-      TableInput:
-        Name: !Ref DbTableRaw
-        StorageDescriptor:
-          StoredAsSubDirectories: false
-          Compressed: False
-          InputFormat: org.apache.hadoop.mapred.TextInputFormat
-          NumberOfBuckets: -1
-          OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-          Location: !Join ['', ['s3://', !Ref BackupBucketName, '/raw/']]
-          SerdeInfo:
-            SerializationLibrary: org.openx.data.jsonserde.JsonSerDe
-          Columns:
-          - Name: coordinates
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: retweeted
-            Type: boolean
-          - Name: source
-            Type: string
-          - Name: entities
-            Type: struct<hashtags:array<struct<text:string,indices:array<bigint>>>,urls:array<struct<url:string,expanded_url:string,display_url:string,indices:array<bigint>>>>
-          - Name: reply_count
-            Type: bigint
-          - Name: favorite_count
-            Type: bigint
-          - Name: geo
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: id_str
-            Type: string
-          - Name: timestamp_ms
-            Type: bigint
-          - Name: truncated
-            Type: boolean
-          - Name: text
-            Type: string
-          - Name: retweet_count
-            Type: bigint
-          - Name: id
-            Type: bigint
-          - Name: possibly_sensitive
-            Type: boolean
-          - Name: filter_level
-            Type: string
-          - Name: created_at
-            Type: string
-          - Name: place
-            Type: struct<id:string,url:string,place_type:string,name:string,full_name:string,country_code:string,country:string,bounding_box:struct<type:string,coordinates:array<array<array<float>>>>>
-          - Name: favorited
-            Type: boolean
-          - Name: lang
-            Type: string
-          - Name: in_reply_to_screen_name
-            Type: string
-          - Name: is_quote_status
-            Type: boolean
-          - Name: in_reply_to_user_id_str
-            Type: string
-          - Name: user
-            Type: struct<id:bigint,id_str:string,name:string,screen_name:string,location:string,url:string,description:string,translator_type:string,protected:boolean,verified:boolean,followers_count:bigint,friends_count:bigint,listed_count:bigint,favourites_count:bigint,statuses_count:bigint,created_at:string,utc_offset:bigint,time_zone:string,geo_enabled:boolean,lang:string,contributors_enabled:boolean,is_translator:boolean,profile_background_color:string,profile_background_image_url:string,profile_background_image_url_https:string,profile_background_tile:boolean,profile_link_color:string,profile_sidebar_border_color:string,profile_sidebar_fill_color:string,profile_text_color:string,profile_use_background_image:boolean,profile_image_url:string,profile_image_url_https:string,profile_banner_url:string,default_profile:boolean,default_profile_image:boolean>
-          - Name: quote_count
-            Type: bigint
-        Parameters: {'classification': 'json'}
-        PartitionKeys:
-          -
-            Type: string
-            Name: year
-          -
-            Type: string
-            Name: month
-          -
-            Type: string
-            Name: day
-          -
-            Type: string
-            Name: hour
-        TableType: "EXTERNAL_TABLE"
-      DatabaseName: !Ref GlueDB
-      CatalogId: !Ref AWS::AccountId
-
-  PartFnPermissionRaw:
-    Type: "AWS::Lambda::Permission"
-    Properties: 
-      Action: "lambda:InvokeFunction"
-      FunctionName: !GetAtt PartitionFn.Arn
-      Principal: "s3.amazonaws.com"
-      SourceAccount: !Ref AWS::AccountId
-      SourceArn: !Join ["", ["arn:aws:s3:::", !Ref BackupBucketName]]
-
-  PartitionFn:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: Record new partitions in Glue catalog
-      Runtime: python3.7
-      Role: !GetAtt PartitionFnRole.Arn
-      Handler: index.handler
-      Environment:
-        Variables:
-          PartitionFor: !Ref DbTableRaw
-          DatabaseName: !Ref DbName
-          PartitionPrefix: 'raw'
-      Timeout: 60
-      MemorySize: 512
-      Tags:
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-PartitionFn"]]
-      Code:
-        ZipFile: |
-          from __future__ import print_function
-          import base64
-          import json
-          import boto3
-          import csv
-          import array
-          import os
-          import traceback
-          import re
-
-          table = os.environ['PartitionFor']
-          databaseName = os.environ['DatabaseName']
-          prefix = os.environ['PartitionPrefix']
-          client = boto3.client('glue')
-
-          def handler(event, context):
-
-              bad_records = []
-              for record in event['Records']:
-                  bucket = record['s3']['bucket']['name']
-                  key = record['s3']['object']['key'] 
-                  print("Detected create event: {0}/{1}".format(bucket, key))
-
-                  m = re.search(prefix + '\/(\d{4})\/(\d{2})\/(\d{2})\/(\d{2})', key)
-                  if m == None:
-                      print("Did not find partition pattern, skipping: {0}".format(key))
-                      continue
-                  year = m.group(1)
-                  month = m.group(2)
-                  day = m.group(3)
-                  hour = m.group(4)
-                  partition = "{0}/{1}/{2}/{3}".format(year, month, day, hour)
-
-                  # See if partition already exists
-                  exists = True
-                  tbl = None
-                  try:
-                      tbl = client.get_table(
-                          DatabaseName=databaseName,
-                          Name=table
-                      )
-                      response = client.get_partition(
-                          DatabaseName=databaseName,
-                          TableName=table,
-                          PartitionValues=[
-                              year,
-                              month,
-                              day,
-                              hour
-                          ]
-                      )
-                      print("Partition {0} already exists for table {1}, skipping".format(partition, table))
-                  except Exception as e:
-                      exists = False
-                      print("Partition {0} does not exist for table {1}, creating".format(partition, table))
-
-                  if exists == False:
-                      try:
-                          sdescriptor = tbl['Table']['StorageDescriptor']
-                          response = client.create_partition(
-                              DatabaseName=databaseName,
-                              TableName=table,
-                              PartitionInput={
-                                  'Values': [
-                                      year,
-                                      month,
-                                      day,
-                                      hour
-                                  ],
-                                  'StorageDescriptor': {
-                                      'Columns': sdescriptor['Columns'],
-                                      'Location': "{0}/{1}/".format(sdescriptor['Location'], partition),
-                                      'InputFormat': sdescriptor['InputFormat'],
-                                      'OutputFormat': sdescriptor['OutputFormat'],
-                                      'Compressed': False,
-                                      'SerdeInfo': sdescriptor['SerdeInfo'],
-                                      'StoredAsSubDirectories': False
-                                  },
-                                  'Parameters': tbl['Table']['Parameters']
-                              }
-                          )
-
-                      except Exception as e:
-                          trc = traceback.format_exc()
-                          print("Error creating partition {0} for table {1}: {2}".format(partition, table, trc))
-                          bad_records.append(partition)
-
-                  return 'Processed {0} records, with {1} partition failures.'.format(len(event['Records']), len(bad_records))
-
-  PartitionFnRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "lambda.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns:
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Policies:
-        -
-          PolicyName: lambda_glue
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: 
-                  - glue:GetTable
-                  - glue:BatchCreatePartitions
-                  - glue:GetPartition
-                  - glue:CreatePartition
-                  - lakeformation:*
-                  - glue:*
-                Resource: 
-                  - !Join ["", ["arn:aws:glue:", !Ref AWS::Region, ":", !Ref AWS::AccountId, ":table/", !Ref DbName, "/", !Ref DbTableRaw]]
-                  - !Join ["", ["arn:aws:glue:", !Ref AWS::Region, ":", !Ref AWS::AccountId, ":database/", !Ref DbName]]
-                  - !Join ["", ["arn:aws:glue:", !Ref AWS::Region, ":", !Ref AWS::AccountId, ":catalog"]]
-
-  GlueTableNightly:
-    Type: "AWS::Glue::Table"
-    Properties:
-      TableInput:
-        Name: !Ref DbTableNightly
-        StorageDescriptor:
-          StoredAsSubDirectories: false
-          Compressed: False
-          InputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat
-          NumberOfBuckets: -1
-          OutputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat
-          Location: !Join ['', ['s3://', !Ref BackupBucketName, '/nightly/']]
-          SerdeInfo:
-            SerializationLibrary: org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe
-            Parameters: {'serialization.format': '1'}
-          Columns:
-          - Name: coordinates
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: retweeted
-            Type: boolean
-          - Name: source
-            Type: string
-          - Name: entities
-            Type: struct<hashtags:array<struct<text:string,indices:array<bigint>>>,urls:array<struct<url:string,expanded_url:string,display_url:string,indices:array<bigint>>>>
-          - Name: reply_count
-            Type: bigint
-          - Name: favorite_count
-            Type: bigint
-          - Name: geo
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: id_str
-            Type: string
-          - Name: timestamp_ms
-            Type: bigint
-          - Name: truncated
-            Type: boolean
-          - Name: text
-            Type: string
-          - Name: retweet_count
-            Type: bigint
-          - Name: id
-            Type: bigint
-          - Name: possibly_sensitive
-            Type: boolean
-          - Name: filter_level
-            Type: array<string>
-          - Name: created_at
-            Type: string
-          - Name: place
-            Type: struct<id:string,url:string,place_type:array<string>,name:string,full_name:string,country_code:string,country:string,bounding_box:struct<type:string,coordinates:array<array<array<double>>>>>
-          - Name: favorited
-            Type: boolean
-          - Name: lang
-            Type: string
-          - Name: in_reply_to_screen_name
-            Type: string
-          - Name: is_quote_status
-            Type: boolean
-          - Name: in_reply_to_user_id_str
-            Type: string
-          - Name: user
-            Type: struct<id:bigint,id_str:string,name:string,screen_name:string,location:string,url:string,description:string,translator_type:array<string>,protected:boolean,verified:boolean,followers_count:bigint,friends_count:bigint,listed_count:bigint,favourites_count:bigint,statuses_count:bigint,created_at:string,utc_offset:bigint,time_zone:string,geo_enabled:boolean,lang:string,contributors_enabled:boolean,is_translator:boolean,profile_background_color:string,profile_background_image_url:string,profile_background_image_url_https:string,profile_background_tile:boolean,profile_link_color:string,profile_sidebar_border_color:string,profile_sidebar_fill_color:string,profile_text_color:string,profile_use_background_image:boolean,profile_image_url:string,profile_image_url_https:string,profile_banner_url:string,default_profile:boolean,default_profile_image:boolean>
-          - Name: quote_count
-            Type: bigint
-          - Name: year_ingested
-            Type: string
-          - Name: month_ingested
-            Type: string
-          - Name: day_ingested
-            Type: string
-        Parameters: {'classification': 'PARQUET'}
-        TableType: "EXTERNAL_TABLE"
-      DatabaseName: !Ref GlueDB
-      CatalogId: !Ref AWS::AccountId
-
-  GlueTableInventory:
-    Type: "AWS::Glue::Table"
-    Properties:
-      TableInput:
-        Name: !Ref DbTableInventory
-        StorageDescriptor:
-          StoredAsSubDirectories: false
-          Compressed: False
-          InputFormat: org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat
-          NumberOfBuckets: -1
-          OutputFormat: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
-          Location: !Join ['', ['s3://', !Ref InventoryBucketName, '/inventory/raw/', !Ref BackupBucketName, '/BackupInventoryRaw/hive']]
-          SerdeInfo:
-            SerializationLibrary: org.apache.hadoop.hive.serde2.OpenCSVSerde
-            Parameters: 
-              serialization.format: "1"
-          Columns:
-          - Name: bucket
-            Type: string
-          - Name: key
-            Type: string
-          - Name: version_id
-            Type: string
-          - Name: is_latest
-            Type: boolean
-          - Name: is_delete_marker
-            Type: boolean
-          - Name: replication_status
-            Type: string
-        PartitionKeys:
-          -
-            Type: string
-            Name: dt 
-        TableType: "EXTERNAL_TABLE"
-      DatabaseName: !Ref GlueDB
-      CatalogId: !Ref AWS::AccountId
-
-  GlueTableInventoryNightly:
-    Type: "AWS::Glue::Table"
-    Properties:
-      TableInput:
-        Name: !Ref DbTableInventoryNightly
-        StorageDescriptor:
-          StoredAsSubDirectories: false
-          Compressed: False
-          InputFormat: org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat
-          NumberOfBuckets: -1
-          OutputFormat: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
-          Location: !Join ['', ['s3://', !Ref InventoryBucketName, '/inventory/nightly/', !Ref BackupBucketName, '/BackupInventoryNightly/hive']]
-          SerdeInfo:
-            SerializationLibrary: org.apache.hadoop.hive.serde2.OpenCSVSerde
-            Parameters: 
-              serialization.format: "1"
-          Columns:
-          - Name: bucket
-            Type: string
-          - Name: key
-            Type: string
-          - Name: version_id
-            Type: string
-          - Name: is_latest
-            Type: boolean
-          - Name: is_delete_marker
-            Type: boolean
-          - Name: replication_status
-            Type: string
-        PartitionKeys:
-          -
-            Type: string
-            Name: dt 
-        TableType: "EXTERNAL_TABLE"
-      DatabaseName: !Ref GlueDB
-      CatalogId: !Ref AWS::AccountId
\ No newline at end of file
diff --git a/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-infra.yaml b/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-infra.yaml
deleted file mode 100644
index 6790dd295..000000000
--- a/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/dr-infra.yaml
+++ /dev/null
@@ -1,996 +0,0 @@
-# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-# 
-#     https://www.apache.org/licenses/LICENSE-2.0
-# 
-# or in the "license" file accompanying this file. This file is distributed 
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-# express or implied. See the License for the specific language governing 
-# permissions and limitations under the License.
-
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Infrastructure for backup/restore strategy for an analytics workload'
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: General
-        Parameters:
-          - ProjectName
-          - BackupBucket 
-      - Label:
-          default: Networking
-        Parameters:
-          - vpccidr
-          - AppPublicCIDRA
-          - AppPrivateCIDRA
-          - AppPrivateCIDRB
-          - AppPrivateCIDRC
-          - AppPrivateCIDRD
-          - AllowedPrefixIngress
-          - AllowedCidrIngress
-      - Label:
-          default: Kinesis Configuration
-        Parameters:
-          - RawShardCount
-Parameters:
-  ProjectName:
-    Description: Tagging identifier
-    Type: String
-    Default: "BackupRestoreAnalytics"
-  RawShardCount:
-    Description: Shard count for raw input stream
-    Type: Number
-    Default: 1
-  vpccidr:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/16
-    Default: 10.20.0.0/16
-  AppPublicCIDRA:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.1.0/24
-  AppPrivateCIDRA:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.3.0/24
-  AppPrivateCIDRB:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.4.0/24
-  AppPrivateCIDRC:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.5.0/24
-  AppPrivateCIDRD:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.6.0/24
-  AllowedPrefixIngress:
-    Description: Prefix for allowed inbound traffic
-    Type: String
-  AllowedCidrIngress:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-  BackupBucket:
-    Description: S3 bucket for storage
-    Type: String
-  TargetTableName:
-    Type: String
-    Description: TargetTableName which needs to be restored
-  BackupArn:
-    Type: String
-    Description: BackupArn which needs to be restored
-  SourceTableArn:
-    Type: String
-    Description: SourceTableArn which needs to be restored
-  
-Resources:
-  RawStream: 
-    Type: AWS::Kinesis::Stream 
-    Properties: 
-      Name: !Join ['_', [!Ref ProjectName, 'RawStream']]
-      ShardCount: !Ref RawShardCount
-      Tags: 
-        - Key: "Project"
-          Value: !Ref ProjectName
-  ProcessedStream: 
-    Type: AWS::Kinesis::Stream 
-    Properties: 
-      Name: !Join ['_', [!Ref ProjectName, 'ProcessedStream']]
-      ShardCount: !Ref RawShardCount
-      Tags: 
-        - Key: "Project"
-          Value: !Ref ProjectName
-
-  IngestFnRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "lambda.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns:
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Policies:
-        -
-          PolicyName: lambda_kinesis
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: kinesis:PutRecord
-                Resource: !GetAtt RawStream.Arn
-              -
-                Effect: Allow
-                Action: kinesis:PutRecords
-                Resource: !GetAtt RawStream.Arn
-              -
-                Effect: Allow
-                Action: kinesis:DescribeStream
-                Resource: !GetAtt RawStream.Arn
-
-  IngestFn:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: Accept incoming messages and relay to a Kinesis stream
-      Runtime: python3.7
-      Role: !GetAtt IngestFnRole.Arn
-      Handler: index.handler
-      Environment:
-        Variables:
-          StreamName: !Ref RawStream
-      Timeout: 10
-      Tags:
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-IngestFn"]]
-      Code:
-        ZipFile: |
-          import boto3
-          import os
-          import time
-          import json
-          import base64
-
-          kinesis = boto3.client('kinesis')
-          stream = os.environ['StreamName']
-          pkey = str(int(time.time()))
-
-          def handler(event, context):
-            print('Received event: ' + str(event))
-            record = event['body']
-            decodedBytes = base64.b64decode(record)
-            decodedStr = str(decodedBytes, "utf-8")
-
-            scode = 200
-            sdesc = "200 OK"
-            try:
-              kinesis.put_record(
-                  StreamName=stream,
-                  Data=decodedStr + "\n",
-                  PartitionKey=pkey)
-            except Exception as e:
-              print("Failed writing to Kinesis")
-              scode = 400
-              sdesc = "400 Failed"
-
-            return {
-                "isBase64Encoded": False,
-                "statusCode": scode,
-                "statusDescription": sdesc,
-                "body": sdesc
-            }
-
-  VPC:
-    Type: "AWS::EC2::VPC"
-    Properties:
-      CidrBlock: !Ref vpccidr
-      EnableDnsHostnames: 'true'
-      EnableDnsSupport: 'true'
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-VPC"]]
-
-  IGW:
-    Type: "AWS::EC2::InternetGateway"
-    Properties:
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-IGW"]]
-  GatewayAttach:
-    Type: "AWS::EC2::VPCGatewayAttachment"
-    Properties:
-      InternetGatewayId: !Ref IGW
-      VpcId: !Ref VPC
-  
-  SubnetPublicA: 
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [0, !GetAZs ]
-      CidrBlock: !Ref AppPublicCIDRA
-      MapPublicIpOnLaunch: true
-      VpcId: !Ref VPC
-  SubnetRouteTableAssociatePublicA: 
-    DependsOn: SubnetPublicA
-    Type: "AWS::EC2::SubnetRouteTableAssociation"
-    Properties:
-      RouteTableId: !Ref RouteTablePublic
-      SubnetId: !Ref SubnetPublicA
-  RouteDefaultPublic:
-    Type: "AWS::EC2::Route"
-    DependsOn: GatewayAttach
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-      RouteTableId: !Ref RouteTablePublic
-  RouteTablePublic:
-    Type: "AWS::EC2::RouteTable"
-    Properties:
-      VpcId: !Ref VPC
-  EIPNatGWA:
-    DependsOn: GatewayAttach
-    Type: "AWS::EC2::EIP"
-    Properties:
-      Domain: vpc
-  NatGatewayA:
-    Type: "AWS::EC2::NatGateway"
-    Properties:
-      AllocationId: !GetAtt EIPNatGWA.AllocationId
-      SubnetId: !Ref SubnetPublicA
-  RouteTablePrivateA:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-RT-PrivateA"]]
-  PrivateSubnetRouteTableAssociationA:
-    DependsOn: SubnetPrivateA
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref SubnetPrivateA
-      RouteTableId: !Ref RouteTablePrivateA
-  RouteDefaultPrivateA:
-    Type: "AWS::EC2::Route"
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref NatGatewayA
-      RouteTableId: !Ref RouteTablePrivateA
-  SubnetPrivateA:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [0, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRA
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateA"]]
-  SubnetPrivateB:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [1, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRB
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateB"]]
-  SubnetPrivateC:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [2, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRC
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateC"]]
-  SubnetPrivateD:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [0, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRD
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateD"]]
-
-  LbSecurityGroup:
-    Type: "AWS::EC2::SecurityGroup"
-    Properties:
-      GroupDescription: "ALB Security Group"
-      SecurityGroupIngress:
-        - SourcePrefixListId: !Ref AllowedPrefixIngress
-          IpProtocol: "TCP"
-          FromPort: 80
-          ToPort: 80
-        - CidrIp: !Ref AllowedCidrIngress
-          IpProtocol: "TCP"
-          FromPort: 80
-          ToPort: 80
-      VpcId: !Ref VPC
-  AlbForLambda:
-    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
-    Properties: 
-      Scheme: internal
-      Subnets: 
-        - !Ref SubnetPrivateD
-        - !Ref SubnetPrivateB
-        - !Ref SubnetPrivateC
-      SecurityGroups:
-        - !Ref LbSecurityGroup
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Alb"]]
-      Type: application
-
-  LoadBalancerListener:
-    Type: AWS::ElasticLoadBalancingV2::Listener
-    Properties:
-      LoadBalancerArn: !Ref AlbForLambda
-      Port: 80
-      Protocol: HTTP
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref TargetGroup
-
-  ListenerRule:
-    Type: AWS::ElasticLoadBalancingV2::ListenerRule
-    Properties:
-      ListenerArn: !Ref LoadBalancerListener
-      Priority: 1
-      Conditions:
-        - Field: path-pattern
-          Values:
-            - /
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup
-          Type: forward
-
-  AlbLambdaInvokePermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt 
-        - IngestFn
-        - Arn
-      Action: 'lambda:InvokeFunction'
-      Principal: elasticloadbalancing.amazonaws.com
-      
-  TargetGroup:
-    Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    DependsOn: 
-      - AlbForLambda
-      - AlbLambdaInvokePermission
-    Properties:
-      HealthCheckEnabled: false
-      Name: AlbLambdaTg
-      TargetType: lambda
-      Targets:
-      - Id: !GetAtt [ IngestFn, Arn ]
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-AlbTg"]]
-
-  RawFhRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "firehose.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/CloudWatchLogsFullAccess"
-      Policies:
-        -
-          PolicyName: raw_fh
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: 
-                  - "s3:AbortMultipartUpload"
-                  - "s3:GetBucketLocation"
-                  - "s3:GetObject"
-                  - "s3:ListBucket"
-                  - "s3:ListBucketMultipartUploads"
-                  - "s3:PutObject"
-                Resource: 
-                  - !Join ["", ["arn:aws:s3:::", !Ref BackupBucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref BackupBucket, "/*"]]
-              - 
-                Effect: Allow
-                Action:
-                  - "kinesis:DescribeStream"
-                  - "kinesis:GetShardIterator"
-                  - "kinesis:GetRecords"
-                  - "kinesis:ListShards"
-                Resource: !GetAtt RawStream.Arn
-
-  ProcessedFhRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "firehose.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/CloudWatchLogsFullAccess"
-      Policies:
-        -
-          PolicyName: processed_fh
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: 
-                  - "s3:AbortMultipartUpload"
-                  - "s3:GetBucketLocation"
-                  - "s3:GetObject"
-                  - "s3:ListBucket"
-                  - "s3:ListBucketMultipartUploads"
-                  - "s3:PutObject"
-                Resource: 
-                  - !Join ["", ["arn:aws:s3:::", !Ref BackupBucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref BackupBucket, "/*"]]
-              - 
-                Effect: Allow
-                Action:
-                  - "kinesis:DescribeStream"
-                  - "kinesis:GetShardIterator"
-                  - "kinesis:GetRecords"
-                  - "kinesis:ListShards"
-                Resource: !GetAtt ProcessedStream.Arn
-  RawFh:
-    Type: AWS::KinesisFirehose::DeliveryStream
-    Properties: 
-      DeliveryStreamType: KinesisStreamAsSource
-      KinesisStreamSourceConfiguration: 
-        KinesisStreamARN: !GetAtt RawStream.Arn
-        RoleARN: !GetAtt RawFhRole.Arn
-      S3DestinationConfiguration: 
-        BucketARN: !Join ["", ["arn:aws:s3:::", !Ref BackupBucket]]
-        Prefix: "raw/"
-        RoleARN: !GetAtt RawFhRole.Arn
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Rawfh"]]
-
-  ProcessedFh:
-    Type: AWS::KinesisFirehose::DeliveryStream
-    Properties: 
-      DeliveryStreamType: KinesisStreamAsSource
-      KinesisStreamSourceConfiguration: 
-        KinesisStreamARN: !GetAtt ProcessedStream.Arn
-        RoleARN: !GetAtt ProcessedFhRole.Arn
-      S3DestinationConfiguration: 
-        BucketARN: !Join ["", ["arn:aws:s3:::", !Ref BackupBucket]]
-        Prefix: "processed/"
-        RoleARN: !GetAtt ProcessedFhRole.Arn
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Processedfh"]]
-
-
-
-  LambdaFunctionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-              - lambda.amazonaws.com
-          Action:
-            - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: LambdaFunctionPolicy
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-              - logs:CreateLogGroup
-              - logs:CreateLogStream
-              - logs:PutLogEvents
-              - dynamodb:*
-              - kinesis:*
-            Resource: '*'
-
-  ProcessedLambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Timeout: 5
-      Handler: index.handler
-      Role: !GetAtt LambdaFunctionRole.Arn
-      Code:
-        ZipFile:
-          !Sub
-            - |-
-              #!/usr/bin/env python3
-
-              import base64
-              import json
-              import boto3
-
-              print('Loading function')
-
-
-              def handler(event, context):
-                #print("Received event: " + json.dumps(event, indent=2))
-                dynamodb = boto3.resource('dynamodb')
-                table = dynamodb.Table('processed_tweets')
-                for record in event['Records']:
-                  # Kinesis data is base64 encoded so decode here
-                  id=(record['kinesis']['sequenceNumber'])
-                  payload = base64.b64decode(record['kinesis']['data']).decode('utf-8')
-        
-                  table.put_item(Item= {'id': id,'payload':  payload})
-
-                  print("Decoded payload: " + payload)
-                return 'Successfully processed {} records.'.format(len(event['Records']))
-            
-            -
-              lambda_function_role_arn: !Ref LambdaFunctionRole
-
-  InboundStreamLambdaFunctionEventSourceMapping:
-    Type: AWS::Lambda::EventSourceMapping
-    Properties: 
-      BatchSize: 100 
-      Enabled: true
-      EventSourceArn: !GetAtt ProcessedStream.Arn
-      FunctionName: !GetAtt ProcessedLambdaFunction.Arn
-      MaximumBatchingWindowInSeconds: 0
-      StartingPosition: LATEST 
-
-
-  KinesisAnalyticsApp:
-    Type: AWS::KinesisAnalytics::Application
-    Properties:
-      ApplicationName: !Sub '${AWS::StackName}-KinesisAnalyticsApplication'
-      ApplicationDescription: Kineis Analytics Solution Accelerator
-      ApplicationCode: !Sub |
-            -- Approximate distinct count  - Counts the number of distinct items in a stream using HyperLogLog.
-            -- Returns the approximate number of distinct items in a specified column over a tumbling window.
-            -- Note that when there are less or equal to 10,000 items in the window, the function returns exact count.
-            CREATE OR REPLACE STREAM DESTINATION_SQL_STREAM (NUMBER_OF_DISTINCT_ITEMS BIGINT);
-            CREATE OR REPLACE PUMP "STREAM_PUMP" AS INSERT INTO "DESTINATION_SQL_STREAM"
-            SELECT STREAM NUMBER_OF_DISTINCT_ITEMS FROM TABLE(COUNT_DISTINCT_ITEMS_TUMBLING(
-              CURSOR(SELECT STREAM * FROM "SOURCE_SQL_STREAM_001"),
-              'favorite_count', -- name of column in single quotes
-              60 -- tumbling window size in seconds
-              )
-            );
-
-
-      Inputs:
-        - NamePrefix: SOURCE_SQL_STREAM
-          InputSchema:
-            RecordColumns:
-              - Name: type
-                SqlType: VARCHAR(8)
-                Mapping: $.type
-              - Name: coordinates
-                SqlType: VARCHAR(32)
-                Mapping: $.coordinates
-              - Name: retweeted
-                SqlType: BOOLEAN
-                Mapping: $.retweeted
-              - Name: source
-                SqlType: VARCHAR(128)
-                Mapping: $.source
-              - Name: hashtags
-                SqlType: VARCHAR(1024)
-                Mapping: $.hashtags
-              - Name: urls
-                SqlType: VARCHAR(1024)
-                Mapping: $.urls
-              - Name: agent
-                SqlType: VARCHAR(128)
-                Mapping: $.agent
-              - Name: reply_count
-                SqlType: INTEGER
-                Mapping: $.reply_count
-              - Name: favorite_count
-                SqlType: INTEGER
-                Mapping: $.favorite_count
-              - Name: type0
-                SqlType: VARCHAR(8)
-                Mapping: $.type0
-              - Name: coordinates0
-                SqlType: VARCHAR(32)
-                Mapping: $.coordinates0
-              - Name: id_str
-                SqlType: VARCHAR(32)
-                Mapping: $.id_str
-              - Name: timestamp_ms
-                SqlType: BIGINT
-                Mapping: $.timestamp_ms
-              - Name: truncated
-                SqlType: BOOLEAN
-                Mapping: $.truncated
-              - Name: retweet_count
-                SqlType: INTEGER
-                Mapping: $.retweet_count
-              - Name: id
-                SqlType: INTEGER
-                Mapping: $.id  
-              - Name: possibly_sensitive
-                SqlType: BOOLEAN
-                Mapping: $.possibly_sensitive  
-              - Name: filter_level
-                SqlType: VARCHAR(32)
-                Mapping: $.filter_level  
-              - Name: quote_count
-                SqlType: INTEGER
-                Mapping: $.quote_count
-              - Name: lang
-                SqlType: VARCHAR(4)
-                Mapping: $.lang  
-              - Name: favorited
-                SqlType: BOOLEAN
-                Mapping: $.favorited  
-              - Name: is_quote_status
-                SqlType: BOOLEAN
-                Mapping: $.is_quote_status 
-              - Name: created_at
-                SqlType: VARCHAR(16)
-                Mapping: $.created_at 
-              - Name: in_reply_to_screen_name
-                SqlType: VARCHAR(16)
-                Mapping: $.in_reply_to_screen_name 
-              - Name: in_reply_to_user_id_str
-                SqlType: VARCHAR(16)
-                Mapping: $.in_reply_to_user_id_str 
-              - Name: text
-                SqlType: VARCHAR(64)
-                Mapping: $.text 
-              - Name: id0
-                SqlType: INTEGER
-                Mapping: $.id0 
-              - Name: url
-                SqlType: VARCHAR(32)
-                Mapping: $.url 
-              - Name: place_type
-                SqlType: VARCHAR(16)
-                Mapping: $.place_type 
-              - Name: name
-                SqlType: VARCHAR(32)
-                Mapping: $.name 
-              - Name: full_name
-                SqlType: VARCHAR(32)
-                Mapping: $.full_name 
-              - Name: country_code
-                SqlType: VARCHAR(4)
-                Mapping: $.country_code 
-              - Name: country
-                SqlType: VARCHAR(64)
-                Mapping: $.country 
-              - Name: type1
-                SqlType: VARCHAR(8)
-                Mapping: $.type1 
-              - Name: coordinates1
-                SqlType: VARCHAR(1024)
-                Mapping: $.coordinates1 
-              - Name: id1
-                SqlType: INTEGER
-                Mapping: $.id1 
-              - Name: id_str0
-                SqlType: INTEGER
-                Mapping: $.id1 
-            RecordFormat:
-              RecordFormatType: JSON
-              MappingParameters:
-                JSONMappingParameters:
-                  RecordRowPath: $
-          KinesisStreamsInput:
-            ResourceARN: !GetAtt RawStream.Arn
-            RoleARN: !GetAtt KinesisAnalyticsRole.Arn
-
-  KinesisAnalyticsRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: kinesisanalytics.amazonaws.com
-            Action: "sts:AssumeRole"
-      Path: "/"
-      Policies:
-        - PolicyName: Open
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: "*"
-                Resource: "*"
-
-  KinesisAnalyticsAppAnomalyOutput:
-    Type: AWS::KinesisAnalytics::ApplicationOutput
-    Properties:
-      ApplicationName: !Ref KinesisAnalyticsApp
-      Output:
-        DestinationSchema:
-          RecordFormatType: JSON
-        KinesisStreamsOutput:
-          ResourceARN: !GetAtt ProcessedStream.Arn
-          RoleARN: !GetAtt KinesisAnalyticsRole.Arn
-        Name: DESTINATION_SQL_STREAM
-  RestoreOndemandLambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Timeout: 5
-      Handler: index.handler
-      Role: !GetAtt RestoreOndemandLambdaFunctionRole.Arn
-      Environment:
-        Variables:
-          TargetTableName: !Ref TargetTableName
-          BackupArn: !Ref BackupArn
-      Code:
-        ZipFile:
-          !Sub
-            - |-
-              #!/usr/bin/env python3
-
-              import json
-              import boto3
-              import os
-              import cfnresponse
-
-              def handler(event, context):
-                client = boto3.client('dynamodb')
-                TargetTableName=os.environ['TargetTableName']
-                BackupArn=os.environ['BackupArn']
-                response = client.restore_table_from_backup(
-                TargetTableName=TargetTableName,
-                BackupArn=BackupArn,
-                SSESpecificationOverride={'Enabled': False})
-                #responseValue = int(event['ResourceProperties']['Input']) * 5
-                responseData = {}
-                #responseData['Data'] = responseValue
-                cfnresponse.send(event, context, cfnresponse.SUCCESS, responseData, "CustomResourcePhysicalID")
-                # TODO implement
-                return {
-               'statusCode': 200,
-               'body': json.dumps("success")
-                }
-
-            
-            -
-              lambda_function_role_arn: !Ref RestoreOndemandLambdaFunctionRole
-  RestoreOndemandLambdaFunctionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - lambda.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: root
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - logs:*
-            - dynamodb:*
-            Resource: '*'
-  RestorePITRLambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Timeout: 5
-      Handler: index.handler
-      Role: !GetAtt RestorePITRLambdaFunctionRole.Arn
-      Environment:
-        Variables:
-          TargetTableName: !Ref TargetTableName
-          SourceTableArn: !Ref SourceTableArn
-      Code:
-        ZipFile:
-          !Sub
-            - |-
-              #!/usr/bin/env python3
-
-              import json
-              import boto3
-              import os
-              import cfnresponse
-
-              def handler(event, context):
-                client = boto3.client('dynamodb')
-                TargetTableName=os.environ['TargetTableName']
-                SourceTableArn=os.environ['SourceTableArn']
-                response = client.restore_table_to_point_in_time(
-                SourceTableArn=SourceTableArn,
-                TargetTableName=TargetTableName,
-                UseLatestRestorableTime=True,
-                SSESpecificationOverride={'Enabled': False})
-                #responseValue = int(event['ResourceProperties']['Input']) * 5
-                responseData = {}
-                #responseData['Data'] = responseValue
-                cfnresponse.send(event, context, cfnresponse.SUCCESS, responseData, "CustomResourcePhysicalID")
-                # TODO implement
-                return {
-               'statusCode': 200,
-               'body': json.dumps("success")
-                }
-
-            
-            -
-              lambda_function_role_arn: !Ref RestorePITRLambdaFunctionRole
-  RestorePITRLambdaFunctionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - lambda.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: root
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - logs:*
-            - dynamodb:*
-            Resource: '*'
-  Primerinvoke:
-    Type: AWS::CloudFormation::CustomResource
-    DependsOn: RestorePITRLambdaFunction
-    Version: "1.0"
-    Properties:
-      ServiceToken: !GetAtt RestorePITRLambdaFunction.Arn
-  CompactionJob:
-    Type: AWS::Glue::Job
-    Properties:
-      Command:
-        Name: glueetl
-        ScriptLocation: !Join ["", ["s3://", !Ref BackupBucket, "/code/compaction.py"]]
-      MaxRetries: 0
-      MaxCapacity: 10
-      GlueVersion: "2.0"
-      Name: CompactNightly
-      Role: !Ref CompactionJobRole
-
-  CompactionJobRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "glue.amazonaws.com"
-            Action:
-              - "sts:AssumeRole"
-      Path: "/"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole"
-      Policies:
-        -
-          PolicyName: "glue-job-s3"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              -
-                Effect: "Allow"
-                Action: "s3:*"
-                Resource: 
-                  - !Join ["", ["arn:aws:s3:::", !Ref BackupBucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref BackupBucket, "/*"]]
-  
-
-Outputs:
-  VcpId:
-    Description: VPC ID
-    Value: !Ref VPC
-  AlbArn:
-    Description: Endpoint Arn
-    Value: !Ref AlbForLambda
\ No newline at end of file
diff --git a/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/workload.yaml b/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/workload.yaml
deleted file mode 100644
index fcc0d4a29..000000000
--- a/static/Reliability/200_Backup_Restore_Failback_Analytics/Code/cfn/workload.yaml
+++ /dev/null
@@ -1,1759 +0,0 @@
-# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-# 
-#     https://www.apache.org/licenses/LICENSE-2.0
-# 
-# or in the "license" file accompanying this file. This file is distributed 
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-# express or implied. See the License for the specific language governing 
-# permissions and limitations under the License.
-
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'An analytics workload with batch and stream processing functions'
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: General
-        Parameters:
-          - ProjectName
-          - Bucket 
-          - ReplBucketName
-      - Label:
-          default: Networking
-        Parameters:
-          - vpccidr
-          - AppPublicCIDRA
-          - AppPrivateCIDRA
-          - AppPrivateCIDRB
-          - AppPrivateCIDRC
-          - AppPrivateCIDRD
-          - AllowedPrefixIngress
-      - Label:
-          default: Endpoint Configuration
-        Parameters:
-          - EndpointName
-      - Label:
-          default: Kinesis Configuration
-        Parameters:
-          - RawShardCount
-      - Label:
-          default: Producer Configuration
-        Parameters:
-          - LatestAmiId
-          - ProducerInstanceType
-          - ProducerVolumeSize
-      - Label:
-          default: Consumer Configuration
-        Parameters:
-          - DbName
-          - DbTableRaw
-          - DbTableNightly
-Parameters:
-  DbName:
-    Description: Glue database name
-    Type:  String
-    Default: "backuprestoredb"
-  DbTableRaw:
-    Description: Glue table name for raw input
-    Type:  String
-    Default: "rawdata"
-  DbTableNightly:
-    Description: Glue table name for nightly compacted table
-    Type:  String
-    Default: "compacteddata"
-  LatestAmiId:
-    Description: DO NOT EDIT, looks up latest Amazon Linux AMI
-    Type:  'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  ProducerInstanceType:
-    Description: Instance type to use for sample producer
-    Type:  String
-    Default: "t3.medium"
-  ProducerVolumeSize:
-    Description: Volume size for sample EC2 producer
-    Type: Number
-    Default: 40
-  EndpointName:
-    Description: Logical name for the Global Accelerator endpoint
-    Type: String
-    Default: "KinesisFeed"
-  ProjectName:
-    Description: Tagging identifier
-    Type: String
-    Default: "BackupRestoreAnalytics"
-  RawShardCount:
-    Description: Shard count for raw input stream
-    Type: Number
-    Default: 1
-  vpccidr:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/16
-    Default: 10.20.0.0/16
-  AppPublicCIDRA:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.1.0/24
-  AppPrivateCIDRA:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.3.0/24
-  AppPrivateCIDRB:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.4.0/24
-  AppPrivateCIDRC:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.5.0/24
-  AppPrivateCIDRD:
-    Type: String
-    MinLength: 9
-    MaxLength: 18
-    AllowedPattern: "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
-    ConstraintDescription: Must be a valid CIDR range in the form x.x.x.x/22
-    Default: 10.20.6.0/24
-  AllowedPrefixIngress:
-    Description: Prefix for allowed inbound traffic
-    Type: String
-  Bucket:
-    Description: S3 bucket for storage
-    Type: String
-  ReplBucketName:
-    Description: S3 bucket for DR
-    Type: String
-  
-Resources:
-  GlobalEndpoint:
-    Type: AWS::GlobalAccelerator::Accelerator
-    Properties: 
-      Enabled: True
-      Name: !Ref EndpointName
-      Tags: 
-        - Key: "Project"
-          Value: !Ref ProjectName
-
-  RawStream: 
-    Type: AWS::Kinesis::Stream 
-    Properties: 
-      Name: !Join ['_', [!Ref ProjectName, 'RawStream']]
-      ShardCount: !Ref RawShardCount
-      Tags: 
-        - Key: "Project"
-          Value: !Ref ProjectName
-  ProcessedStream: 
-    Type: AWS::Kinesis::Stream 
-    Properties: 
-      Name: !Join ['_', [!Ref ProjectName, 'ProcessedStream']]
-      ShardCount: !Ref RawShardCount
-      Tags: 
-        - Key: "Project"
-          Value: !Ref ProjectName
-
-  IngestFnRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "lambda.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns:
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Policies:
-        -
-          PolicyName: lambda_kinesis
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: kinesis:PutRecord
-                Resource: !GetAtt RawStream.Arn
-              -
-                Effect: Allow
-                Action: kinesis:PutRecords
-                Resource: !GetAtt RawStream.Arn
-              -
-                Effect: Allow
-                Action: kinesis:DescribeStream
-                Resource: !GetAtt RawStream.Arn
-
-  PartitionFnRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "lambda.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns:
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Policies:
-        -
-          PolicyName: lambda_glue
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: 
-                  - glue:GetTable
-                  - glue:BatchCreatePartitions
-                  - glue:GetPartition
-                  - glue:CreatePartition
-                Resource: 
-                  - !Join ["", ["arn:aws:glue:", !Ref AWS::Region, ":", !Ref AWS::AccountId, ":table/", !Ref DbName, "/", !Ref DbTableRaw]]
-                  - !Join ["", ["arn:aws:glue:", !Ref AWS::Region, ":", !Ref AWS::AccountId, ":database/", !Ref DbName]]
-                  - !Join ["", ["arn:aws:glue:", !Ref AWS::Region, ":", !Ref AWS::AccountId, ":catalog"]]
-
-  IngestFn:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: Accept incoming messages and relay to a Kinesis stream
-      Runtime: python3.7
-      Role: !GetAtt IngestFnRole.Arn
-      Handler: index.handler
-      Environment:
-        Variables:
-          StreamName: !Ref RawStream
-      Timeout: 10
-      Tags:
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-IngestFn"]]
-      Code:
-        ZipFile: |
-          import boto3
-          import os
-          import time
-          import json
-          import base64
-
-          kinesis = boto3.client('kinesis')
-          stream = os.environ['StreamName']
-          pkey = str(int(time.time()))
-
-          def handler(event, context):
-            print('Received event: ' + str(event))
-            record = event['body']
-            decodedBytes = base64.b64decode(record)
-            decodedStr = str(decodedBytes, "utf-8")
-
-            scode = 200
-            sdesc = "200 OK"
-            try:
-              kinesis.put_record(
-                  StreamName=stream,
-                  Data=decodedStr + "\n",
-                  PartitionKey=pkey)
-            except Exception as e:
-              print("Failed writing to Kinesis")
-              scode = 400
-              sdesc = "400 Failed"
-
-            return {
-                "isBase64Encoded": False,
-                "statusCode": scode,
-                "statusDescription": sdesc,
-                "body": sdesc
-            }
-
-  VPC:
-    Type: "AWS::EC2::VPC"
-    Properties:
-      CidrBlock: !Ref vpccidr
-      EnableDnsHostnames: 'true'
-      EnableDnsSupport: 'true'
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-VPC"]]
-
-  IGW:
-    Type: "AWS::EC2::InternetGateway"
-    Properties:
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-IGW"]]
-  GatewayAttach:
-    Type: "AWS::EC2::VPCGatewayAttachment"
-    Properties:
-      InternetGatewayId: !Ref IGW
-      VpcId: !Ref VPC
-  
-  SubnetPublicA: 
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [0, !GetAZs ]
-      CidrBlock: !Ref AppPublicCIDRA
-      MapPublicIpOnLaunch: true
-      VpcId: !Ref VPC
-  SubnetRouteTableAssociatePublicA: 
-    DependsOn: SubnetPublicA
-    Type: "AWS::EC2::SubnetRouteTableAssociation"
-    Properties:
-      RouteTableId: !Ref RouteTablePublic
-      SubnetId: !Ref SubnetPublicA
-  RouteDefaultPublic:
-    Type: "AWS::EC2::Route"
-    DependsOn: GatewayAttach
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-      RouteTableId: !Ref RouteTablePublic
-  RouteTablePublic:
-    Type: "AWS::EC2::RouteTable"
-    Properties:
-      VpcId: !Ref VPC
-  EIPNatGWA:
-    DependsOn: GatewayAttach
-    Type: "AWS::EC2::EIP"
-    Properties:
-      Domain: vpc
-  NatGatewayA:
-    Type: "AWS::EC2::NatGateway"
-    Properties:
-      AllocationId: !GetAtt EIPNatGWA.AllocationId
-      SubnetId: !Ref SubnetPublicA
-  RouteTablePrivateA:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-RT-PrivateA"]]
-  PrivateSubnetRouteTableAssociationA:
-    DependsOn: SubnetPrivateA
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref SubnetPrivateA
-      RouteTableId: !Ref RouteTablePrivateA
-  RouteDefaultPrivateA:
-    Type: "AWS::EC2::Route"
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref NatGatewayA
-      RouteTableId: !Ref RouteTablePrivateA
-  SubnetPrivateA:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [0, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRA
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateA"]]
-  SubnetPrivateB:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [1, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRB
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateB"]]
-  SubnetPrivateC:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [2, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRC
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateC"]]
-  SubnetPrivateD:
-    Type: "AWS::EC2::Subnet"
-    Properties:
-      AvailabilityZone: !Select [0, !GetAZs ]
-      CidrBlock: !Ref AppPrivateCIDRD
-      MapPublicIpOnLaunch: false
-      VpcId: !Ref VPC
-      Tags:
-        -
-          Key: Project
-          Value: !Ref ProjectName
-        -
-          Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Subnet-PrivateD"]]
-
-  LbSecurityGroup:
-    Type: "AWS::EC2::SecurityGroup"
-    Properties:
-      GroupDescription: "ALB Security Group"
-      SecurityGroupIngress:
-        - SourcePrefixListId: !Ref AllowedPrefixIngress
-          IpProtocol: "TCP"
-          FromPort: 80
-          ToPort: 80
-        - CidrIp: !Join ["", [!Ref EIPNatGWA, "/32"]]
-          IpProtocol: "TCP"
-          FromPort: 80
-          ToPort: 80
-      VpcId: !Ref VPC
-  AlbForLambda:
-    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
-    Properties: 
-      Scheme: internal
-      Subnets: 
-        - !Ref SubnetPrivateD
-        - !Ref SubnetPrivateB
-        - !Ref SubnetPrivateC
-      SecurityGroups:
-        - !Ref LbSecurityGroup
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Alb"]]
-      Type: application
-
-  LoadBalancerListener:
-    Type: AWS::ElasticLoadBalancingV2::Listener
-    Properties:
-      LoadBalancerArn: !Ref AlbForLambda
-      Port: 80
-      Protocol: HTTP
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref TargetGroup
-
-  ListenerRule:
-    Type: AWS::ElasticLoadBalancingV2::ListenerRule
-    Properties:
-      ListenerArn: !Ref LoadBalancerListener
-      Priority: 1
-      Conditions:
-        - Field: path-pattern
-          Values:
-            - /
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup
-          Type: forward
-
-  AlbLambdaInvokePermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !GetAtt 
-        - IngestFn
-        - Arn
-      Action: 'lambda:InvokeFunction'
-      Principal: elasticloadbalancing.amazonaws.com
-      
-  TargetGroup:
-    Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    DependsOn: 
-      - AlbForLambda
-      - AlbLambdaInvokePermission
-    Properties:
-      HealthCheckEnabled: false
-      Name: AlbLambdaTg
-      TargetType: lambda
-      Targets:
-      - Id: !GetAtt [ IngestFn, Arn ]
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-AlbTg"]]
-
-  EndpointListener:
-    Type: AWS::GlobalAccelerator::Listener
-    Properties:
-      AcceleratorArn:
-        Ref: GlobalEndpoint
-      Protocol: TCP
-      PortRanges:
-      - FromPort: 80
-        ToPort: 80
-
-  EndpointGroup:
-    Type: AWS::GlobalAccelerator::EndpointGroup
-    Properties:
-      ListenerArn:
-        Ref: EndpointListener
-      EndpointGroupRegion:
-        Ref: AWS::Region
-      TrafficDialPercentage: 100
-      EndpointConfigurations:
-      - EndpointId: !Ref AlbForLambda
-        ClientIPPreservationEnabled: True
-        Weight: 100
-
-  RawFhRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "firehose.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/CloudWatchLogsFullAccess"
-      Policies:
-        -
-          PolicyName: raw_fh
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: 
-                  - "s3:AbortMultipartUpload"
-                  - "s3:GetBucketLocation"
-                  - "s3:GetObject"
-                  - "s3:ListBucket"
-                  - "s3:ListBucketMultipartUploads"
-                  - "s3:PutObject"
-                Resource: 
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket, "/*"]]
-              - 
-                Effect: Allow
-                Action:
-                  - "kinesis:DescribeStream"
-                  - "kinesis:GetShardIterator"
-                  - "kinesis:GetRecords"
-                  - "kinesis:ListShards"
-                Resource: !GetAtt RawStream.Arn
-
-  ProcessedFhRole:
-    Type: "AWS::IAM::Role"
-    Properties: 
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "firehose.amazonaws.com"
-            Action:
-                - "sts:AssumeRole"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/CloudWatchLogsFullAccess"
-      Policies:
-        -
-          PolicyName: processed_fh
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              -
-                Effect: Allow
-                Action: 
-                  - "s3:AbortMultipartUpload"
-                  - "s3:GetBucketLocation"
-                  - "s3:GetObject"
-                  - "s3:ListBucket"
-                  - "s3:ListBucketMultipartUploads"
-                  - "s3:PutObject"
-                Resource: 
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket, "/*"]]
-              - 
-                Effect: Allow
-                Action:
-                  - "kinesis:DescribeStream"
-                  - "kinesis:GetShardIterator"
-                  - "kinesis:GetRecords"
-                  - "kinesis:ListShards"
-                Resource: !GetAtt ProcessedStream.Arn
-  RawFh:
-    Type: AWS::KinesisFirehose::DeliveryStream
-    Properties: 
-      DeliveryStreamType: KinesisStreamAsSource
-      KinesisStreamSourceConfiguration: 
-        KinesisStreamARN: !GetAtt RawStream.Arn
-        RoleARN: !GetAtt RawFhRole.Arn
-      S3DestinationConfiguration: 
-        BucketARN: !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-        Prefix: "raw/"
-        RoleARN: !GetAtt RawFhRole.Arn
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Rawfh"]]
-
-  
-  ProcessedFh:
-    Type: AWS::KinesisFirehose::DeliveryStream
-    Properties: 
-      DeliveryStreamType: KinesisStreamAsSource
-      KinesisStreamSourceConfiguration: 
-        KinesisStreamARN: !GetAtt ProcessedStream.Arn
-        RoleARN: !GetAtt ProcessedFhRole.Arn
-      S3DestinationConfiguration: 
-        BucketARN: !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-        Prefix: "processed/"
-        RoleARN: !GetAtt ProcessedFhRole.Arn
-      Tags: 
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Processedfh"]]
-
-  ProcessedTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      AttributeDefinitions:
-        - AttributeName: id
-          AttributeType: S
-      KeySchema:
-        - AttributeName: id
-          KeyType: HASH
-      ProvisionedThroughput:
-        ReadCapacityUnits: 5
-        WriteCapacityUnits: 5
-      TableName: "processed_tweets"
-      PointInTimeRecoverySpecification:
-        PointInTimeRecoveryEnabled: true
-      Tags:
-        - Key: "backup"
-          Value: "Hourly"
-
-  LambdaFunctionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-              - lambda.amazonaws.com
-          Action:
-            - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: LambdaFunctionPolicy
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-              - logs:CreateLogGroup
-              - logs:CreateLogStream
-              - logs:PutLogEvents
-              - dynamodb:*
-              - kinesis:*
-            Resource: '*'
-
-  ProcessedLambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Timeout: 5
-      Handler: index.handler
-      Role: !GetAtt LambdaFunctionRole.Arn
-      Code:
-        ZipFile:
-          !Sub
-            - |-
-              #!/usr/bin/env python3
-
-              import base64
-              import json
-              import boto3
-
-              print('Loading function')
-
-
-              def handler(event, context):
-                #print("Received event: " + json.dumps(event, indent=2))
-                dynamodb = boto3.resource('dynamodb')
-                table = dynamodb.Table('processed_tweets')
-                for record in event['Records']:
-                  # Kinesis data is base64 encoded so decode here
-                  id=(record['kinesis']['sequenceNumber'])
-                  payload = base64.b64decode(record['kinesis']['data']).decode('utf-8')
-        
-                  table.put_item(Item= {'id': id,'payload':  payload})
-
-                  print("Decoded payload: " + payload)
-                return 'Successfully processed {} records.'.format(len(event['Records']))
-            
-            -
-              lambda_function_role_arn: !Ref LambdaFunctionRole
-
-  InboundStreamLambdaFunctionEventSourceMapping:
-    Type: AWS::Lambda::EventSourceMapping
-    Properties: 
-      BatchSize: 100 
-      Enabled: true
-      EventSourceArn: !GetAtt ProcessedStream.Arn
-      FunctionName: !GetAtt ProcessedLambdaFunction.Arn
-      MaximumBatchingWindowInSeconds: 0
-      StartingPosition: LATEST 
-
-
-  KinesisAnalyticsApp:
-    Type: AWS::KinesisAnalytics::Application
-    Properties:
-      ApplicationName: !Sub '${AWS::StackName}-KinesisAnalyticsApplication'
-      ApplicationDescription: Kineis Analytics Solution Accelerator
-      ApplicationCode: !Sub |
-            -- Approximate distinct count  - Counts the number of distinct items in a stream using HyperLogLog.
-            -- Returns the approximate number of distinct items in a specified column over a tumbling window.
-            -- Note that when there are less or equal to 10,000 items in the window, the function returns exact count.
-            CREATE OR REPLACE STREAM DESTINATION_SQL_STREAM (NUMBER_OF_DISTINCT_ITEMS BIGINT);
-            CREATE OR REPLACE PUMP "STREAM_PUMP" AS INSERT INTO "DESTINATION_SQL_STREAM"
-            SELECT STREAM NUMBER_OF_DISTINCT_ITEMS FROM TABLE(COUNT_DISTINCT_ITEMS_TUMBLING(
-              CURSOR(SELECT STREAM * FROM "SOURCE_SQL_STREAM_001"),
-              'favorite_count', -- name of column in single quotes
-              60 -- tumbling window size in seconds
-              )
-            );
-
-
-      Inputs:
-        - NamePrefix: SOURCE_SQL_STREAM
-          InputSchema:
-            RecordColumns:
-              - Name: type
-                SqlType: VARCHAR(8)
-                Mapping: $.type
-              - Name: coordinates
-                SqlType: VARCHAR(32)
-                Mapping: $.coordinates
-              - Name: retweeted
-                SqlType: BOOLEAN
-                Mapping: $.retweeted
-              - Name: source
-                SqlType: VARCHAR(128)
-                Mapping: $.source
-              - Name: hashtags
-                SqlType: VARCHAR(1024)
-                Mapping: $.hashtags
-              - Name: urls
-                SqlType: VARCHAR(1024)
-                Mapping: $.urls
-              - Name: agent
-                SqlType: VARCHAR(128)
-                Mapping: $.agent
-              - Name: reply_count
-                SqlType: INTEGER
-                Mapping: $.reply_count
-              - Name: favorite_count
-                SqlType: INTEGER
-                Mapping: $.favorite_count
-              - Name: type0
-                SqlType: VARCHAR(8)
-                Mapping: $.type0
-              - Name: coordinates0
-                SqlType: VARCHAR(32)
-                Mapping: $.coordinates0
-              - Name: id_str
-                SqlType: VARCHAR(32)
-                Mapping: $.id_str
-              - Name: timestamp_ms
-                SqlType: BIGINT
-                Mapping: $.timestamp_ms
-              - Name: truncated
-                SqlType: BOOLEAN
-                Mapping: $.truncated
-              - Name: retweet_count
-                SqlType: INTEGER
-                Mapping: $.retweet_count
-              - Name: id
-                SqlType: INTEGER
-                Mapping: $.id  
-              - Name: possibly_sensitive
-                SqlType: BOOLEAN
-                Mapping: $.possibly_sensitive  
-              - Name: filter_level
-                SqlType: VARCHAR(32)
-                Mapping: $.filter_level  
-              - Name: quote_count
-                SqlType: INTEGER
-                Mapping: $.quote_count
-              - Name: lang
-                SqlType: VARCHAR(4)
-                Mapping: $.lang  
-              - Name: favorited
-                SqlType: BOOLEAN
-                Mapping: $.favorited  
-              - Name: is_quote_status
-                SqlType: BOOLEAN
-                Mapping: $.is_quote_status 
-              - Name: created_at
-                SqlType: VARCHAR(16)
-                Mapping: $.created_at 
-              - Name: in_reply_to_screen_name
-                SqlType: VARCHAR(16)
-                Mapping: $.in_reply_to_screen_name 
-              - Name: in_reply_to_user_id_str
-                SqlType: VARCHAR(16)
-                Mapping: $.in_reply_to_user_id_str 
-              - Name: text
-                SqlType: VARCHAR(64)
-                Mapping: $.text 
-              - Name: id0
-                SqlType: INTEGER
-                Mapping: $.id0 
-              - Name: url
-                SqlType: VARCHAR(32)
-                Mapping: $.url 
-              - Name: place_type
-                SqlType: VARCHAR(16)
-                Mapping: $.place_type 
-              - Name: name
-                SqlType: VARCHAR(32)
-                Mapping: $.name 
-              - Name: full_name
-                SqlType: VARCHAR(32)
-                Mapping: $.full_name 
-              - Name: country_code
-                SqlType: VARCHAR(4)
-                Mapping: $.country_code 
-              - Name: country
-                SqlType: VARCHAR(64)
-                Mapping: $.country 
-              - Name: type1
-                SqlType: VARCHAR(8)
-                Mapping: $.type1 
-              - Name: coordinates1
-                SqlType: VARCHAR(1024)
-                Mapping: $.coordinates1 
-              - Name: id1
-                SqlType: INTEGER
-                Mapping: $.id1 
-              - Name: id_str0
-                SqlType: INTEGER
-                Mapping: $.id1 
-            RecordFormat:
-              RecordFormatType: JSON
-              MappingParameters:
-                JSONMappingParameters:
-                  RecordRowPath: $
-          KinesisStreamsInput:
-            ResourceARN: !GetAtt RawStream.Arn
-            RoleARN: !GetAtt KinesisAnalyticsRole.Arn
-
-  KinesisAnalyticsRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: kinesisanalytics.amazonaws.com
-            Action: "sts:AssumeRole"
-      Path: "/"
-      Policies:
-        - PolicyName: Open
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: "*"
-                Resource: "*"
-
-  KMSKey:
-    Type: AWS::KMS::Key
-    Properties:
-      Description: "Encryption key for Hourly"
-      EnableKeyRotation: True
-      Enabled: True
-      KeyPolicy:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Principal:
-              "AWS": { "Fn::Sub": "arn:${AWS::Partition}:iam::${AWS::AccountId}:root" }
-            Action:
-              - kms:*
-            Resource: "*"
-
- 
-  BackupPlanWithHourlyBackups:
-    Type: "AWS::Backup::BackupPlan"
-    Properties:
-      BackupPlan:
-        BackupPlanName: "BackupPlanWithHourlyBackups"
-        BackupPlanRule:
-          -
-            RuleName: "RuleForHourlyBackups"
-            TargetBackupVault: !Ref BackupVaultWithHourlyBackups
-            ScheduleExpression: "cron(0 5/1 ? * * *)"
-
-    DependsOn: BackupVaultWithHourlyBackups
- 
-
-  BackupRole:
-    Type: "AWS::IAM::Role"
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: "Allow"
-            Principal:
-              Service:
-                - "backup.amazonaws.com"
-            Action:
-              - "sts:AssumeRole"
-      ManagedPolicyArns:
-        - "arn:aws:iam::aws:policy/service-role/AWSBackupServiceRolePolicyForBackup"
-        - "arn:aws:iam::aws:policy/service-role/AWSBackupServiceRolePolicyForRestores"
-
-  TagBasedBackupSelection:
-    Type: "AWS::Backup::BackupSelection"
-    Properties:
-      BackupSelection:
-        SelectionName: "TagBasedBackupSelection"
-        IamRoleArn: !GetAtt BackupRole.Arn
-        ListOfTags:
-          - ConditionType: "STRINGEQUALS"
-            ConditionKey: "backup"
-            ConditionValue: "Hourly"
-      BackupPlanId: !Ref BackupPlanWithHourlyBackups
-    DependsOn: BackupPlanWithHourlyBackups
-
-  BackupVaultWithHourlyBackups:
-    Type: "AWS::Backup::BackupVault"
-    Properties:
-      BackupVaultName: "BackupVaultWithHourlyBackups"
-      EncryptionKeyArn: !GetAtt KMSKey.Arn
-
-  KinesisAnalyticsAppAnomalyOutput:
-    Type: AWS::KinesisAnalytics::ApplicationOutput
-    Properties:
-      ApplicationName: !Ref KinesisAnalyticsApp
-      Output:
-        DestinationSchema:
-          RecordFormatType: JSON
-        KinesisStreamsOutput:
-          ResourceARN: !GetAtt ProcessedStream.Arn
-          RoleARN: !GetAtt KinesisAnalyticsRole.Arn
-        Name: DESTINATION_SQL_STREAM
-
-  BackupLambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Timeout: 5
-      Handler: index.handler
-      Role: !GetAtt BackupLambdaFunctionRole.Arn
-      FunctionName: dynamodb-backup
-      Code:
-        ZipFile:
-          !Sub
-            - |-
-              #!/usr/bin/env python3
-
-              import json
-              import boto3
-              import os
-              #import cfnresponse
-
-              def handler(event, context):
-                client = boto3.client('dynamodb')
-                response = client.create_backup(
-                TableName='processed_tweets',
-                BackupName='processed_tweets_backup'
-                )
-                #responseValue = int(event['ResourceProperties']['Input']) * 5
-                #responseData = {}
-                #responseData['Data'] = responseValue
-                #cfnresponse.send(event, context, cfnresponse.SUCCESS, responseData, "CustomResourcePhysicalID")
-                # TODO implement
-                return {
-               'statusCode': 200,
-               'body': json.dumps("success")
-                }
-
-            
-            -
-              lambda_function_role_arn: !Ref BackupLambdaFunctionRole
-  
-  BackupLambdaFunctionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - lambda.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: root
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - logs:*
-            - dynamodb:*
-            Resource: '*'      
-
-  ProducerSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Security Group for EC2 sample producer
-      VpcId: !Ref VPC
-      Tags:
-        - Key: "Project"
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-ProducerSG"]]
-      SecurityGroupEgress:
-      - CidrIp: 0.0.0.0/0
-        IpProtocol: "-1"
-
-  ProducerRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          -
-            Effect: Allow
-            Principal:
-              Service: ec2.amazonaws.com
-            Action: sts:AssumeRole
-      Path: '/'
-      ManagedPolicyArns:
-        - "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
-      Policies:
-        -
-          PolicyName: producerpolicy
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: Allow
-                Action:
-                  - "s3:GetObject"
-                  - "s3:ListBucket"
-                Resource:
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket, "/*"]]
-
-  ProducerInstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Path: '/'
-      Roles:
-        - !Ref ProducerRole
-
-  SampleProducer:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId : !Ref LatestAmiId
-      InstanceType: !Ref ProducerInstanceType
-      HibernationOptions:
-        Configured: True
-      SecurityGroupIds:
-      - !Ref ProducerSecurityGroup
-      IamInstanceProfile: !Ref ProducerInstanceProfile
-      SubnetId: !Ref SubnetPrivateA
-      BlockDeviceMappings: 
-      - DeviceName: "/dev/xvda"
-        Ebs: 
-          Encrypted: True
-          VolumeType: gp2
-          DeleteOnTermination: True
-          VolumeSize: !Ref ProducerVolumeSize
-      Tags:
-        - Key: "Project"
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-Producer"]]
-      UserData:
-        Fn::Base64:
-          Fn::Sub:
-          - |     # No more Fn::Join needed
-            #!/bin/bash -ex
-            sleep 60
-
-            pip3 install Faker requests
-
-            echo "ENDPOINT=${GlobalEndpointDns}" > /home/ec2-user/config.sh
-
-            aws s3 cp s3://${Bucket}/code/tweetmaker.py /home/ec2-user/tweetmaker.py --region ${Region}
-            chown ec2-user:ec2-user /home/ec2-user/tweetmaker.py
-
-          - {
-              Region: !Ref 'AWS::Region',
-              Bucket: !Ref Bucket,
-              GlobalEndpointDns: !GetAtt GlobalEndpoint.DnsName
-            }
-
-  GlueDB:
-    Type: "AWS::Glue::Database"
-    Properties:
-      DatabaseInput:
-        Name: !Ref DbName
-      CatalogId: !Ref AWS::AccountId
-  GlueTable:
-    Type: "AWS::Glue::Table"
-    Properties:
-      TableInput:
-        Name: !Ref DbTableRaw
-        StorageDescriptor:
-          StoredAsSubDirectories: false
-          Compressed: False
-          InputFormat: org.apache.hadoop.mapred.TextInputFormat
-          NumberOfBuckets: -1
-          OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-          Location: !Join ['', ['s3://', !Ref Bucket, '/raw/']]
-          SerdeInfo:
-            SerializationLibrary: org.openx.data.jsonserde.JsonSerDe
-          Columns:
-          - Name: coordinates
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: retweeted
-            Type: boolean
-          - Name: source
-            Type: string
-          - Name: entities
-            Type: struct<hashtags:array<struct<text:string,indices:array<bigint>>>,urls:array<struct<url:string,expanded_url:string,display_url:string,indices:array<bigint>>>>
-          - Name: reply_count
-            Type: bigint
-          - Name: favorite_count
-            Type: bigint
-          - Name: geo
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: id_str
-            Type: string
-          - Name: timestamp_ms
-            Type: bigint
-          - Name: truncated
-            Type: boolean
-          - Name: text
-            Type: string
-          - Name: retweet_count
-            Type: bigint
-          - Name: id
-            Type: bigint
-          - Name: possibly_sensitive
-            Type: boolean
-          - Name: filter_level
-            Type: string
-          - Name: created_at
-            Type: string
-          - Name: place
-            Type: struct<id:string,url:string,place_type:string,name:string,full_name:string,country_code:string,country:string,bounding_box:struct<type:string,coordinates:array<array<array<float>>>>>
-          - Name: favorited
-            Type: boolean
-          - Name: lang
-            Type: string
-          - Name: in_reply_to_screen_name
-            Type: string
-          - Name: is_quote_status
-            Type: boolean
-          - Name: in_reply_to_user_id_str
-            Type: string
-          - Name: user
-            Type: struct<id:bigint,id_str:string,name:string,screen_name:string,location:string,url:string,description:string,translator_type:string,protected:boolean,verified:boolean,followers_count:bigint,friends_count:bigint,listed_count:bigint,favourites_count:bigint,statuses_count:bigint,created_at:string,utc_offset:bigint,time_zone:string,geo_enabled:boolean,lang:string,contributors_enabled:boolean,is_translator:boolean,profile_background_color:string,profile_background_image_url:string,profile_background_image_url_https:string,profile_background_tile:boolean,profile_link_color:string,profile_sidebar_border_color:string,profile_sidebar_fill_color:string,profile_text_color:string,profile_use_background_image:boolean,profile_image_url:string,profile_image_url_https:string,profile_banner_url:string,default_profile:boolean,default_profile_image:boolean>
-          - Name: quote_count
-            Type: bigint
-        Parameters: {'classification': 'json'}
-        PartitionKeys:
-          -
-            Type: string
-            Name: year
-          -
-            Type: string
-            Name: month
-          -
-            Type: string
-            Name: day
-          -
-            Type: string
-            Name: hour
-        TableType: "EXTERNAL_TABLE"
-      DatabaseName: !Ref GlueDB
-      CatalogId: !Ref AWS::AccountId
-
-  PartFnPermissionRaw:
-    Type: "AWS::Lambda::Permission"
-    Properties: 
-      Action: "lambda:InvokeFunction"
-      FunctionName: !GetAtt PartitionFn.Arn
-      Principal: "s3.amazonaws.com"
-      SourceAccount: !Ref AWS::AccountId
-      SourceArn: !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-  PartitionFn:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: Record new partitions in Glue catalog
-      Runtime: python3.7
-      Role: !GetAtt PartitionFnRole.Arn
-      Handler: index.handler
-      Environment:
-        Variables:
-          PartitionFor: !Ref DbTableRaw
-          DatabaseName: !Ref DbName
-          PartitionPrefix: 'raw'
-      Timeout: 60
-      MemorySize: 512
-      Tags:
-        - Key: Project
-          Value: !Ref ProjectName
-        - Key: Name
-          Value: !Join ["", [!Ref ProjectName, "-PartitionFn"]]
-      Code:
-        ZipFile: |
-          from __future__ import print_function
-          import base64
-          import json
-          import boto3
-          import csv
-          import array
-          import os
-          import traceback
-          import re
-
-          table = os.environ['PartitionFor']
-          databaseName = os.environ['DatabaseName']
-          prefix = os.environ['PartitionPrefix']
-          client = boto3.client('glue')
-
-          def handler(event, context):
-
-              bad_records = []
-              for record in event['Records']:
-                  bucket = record['s3']['bucket']['name']
-                  key = record['s3']['object']['key'] 
-                  print("Detected create event: {0}/{1}".format(bucket, key))
-
-                  m = re.search(prefix + '\/(\d{4})\/(\d{2})\/(\d{2})\/(\d{2})', key)
-                  if m == None:
-                      print("Did not find partition pattern, skipping: {0}".format(key))
-                      continue
-                  year = m.group(1)
-                  month = m.group(2)
-                  day = m.group(3)
-                  hour = m.group(4)
-                  partition = "{0}/{1}/{2}/{3}".format(year, month, day, hour)
-
-                  # See if partition already exists
-                  exists = True
-                  tbl = None
-                  try:
-                      tbl = client.get_table(
-                          DatabaseName=databaseName,
-                          Name=table
-                      )
-                      response = client.get_partition(
-                          DatabaseName=databaseName,
-                          TableName=table,
-                          PartitionValues=[
-                              year,
-                              month,
-                              day,
-                              hour
-                          ]
-                      )
-                      print("Partition {0} already exists for table {1}, skipping".format(partition, table))
-                  except Exception as e:
-                      exists = False
-                      print("Partition {0} does not exist for table {1}, creating".format(partition, table))
-
-                  if exists == False:
-                      try:
-                          sdescriptor = tbl['Table']['StorageDescriptor']
-                          response = client.create_partition(
-                              DatabaseName=databaseName,
-                              TableName=table,
-                              PartitionInput={
-                                  'Values': [
-                                      year,
-                                      month,
-                                      day,
-                                      hour
-                                  ],
-                                  'StorageDescriptor': {
-                                      'Columns': sdescriptor['Columns'],
-                                      'Location': "{0}/{1}/".format(sdescriptor['Location'], partition),
-                                      'InputFormat': sdescriptor['InputFormat'],
-                                      'OutputFormat': sdescriptor['OutputFormat'],
-                                      'Compressed': False,
-                                      'SerdeInfo': sdescriptor['SerdeInfo'],
-                                      'StoredAsSubDirectories': False
-                                  },
-                                  'Parameters': tbl['Table']['Parameters']
-                              }
-                          )
-
-                      except Exception as e:
-                          trc = traceback.format_exc()
-                          print("Error creating partition {0} for table {1}: {2}".format(partition, table, trc))
-                          bad_records.append(partition)
-
-                  return 'Processed {0} records, with {1} partition failures.'.format(len(event['Records']), len(bad_records))
-
-  BucketConfiguration:
-    Type: Custom::S3BucketConfiguration
-    Properties:
-      ServiceToken: !GetAtt S3BucketConfiguration.Arn
-      Bucket: !Ref Bucket
-      NotificationConfiguration:
-        LambdaFunctionConfigurations:
-        - Events: ['s3:ObjectCreated:*']
-          LambdaFunctionArn: !GetAtt PartitionFn.Arn
-          Filter:
-            Key:
-              FilterRules:
-                - 
-                  Name: prefix
-                  Value: "raw/"
-  BucketReplicationConfiguration:
-    DependsOn: NotificationBucketPolicy
-    Type: Custom::S3BucketReplicationConfiguration
-    Properties:
-      ServiceToken: !GetAtt S3BucketReplicationConfiguration.Arn
-      Bucket: !Ref Bucket
-      ReplicationConfiguration:
-        Role: !GetAtt S3ReplRole.Arn
-        Rules:
-        - Destination: 
-            Bucket: !Join ["", ["arn:aws:s3:::", !Ref ReplBucketName]]
-          Prefix: "raw/"
-          Status: "Enabled"
-        - Destination: 
-            Bucket: !Join ["", ["arn:aws:s3:::", !Ref ReplBucketName]]
-          Prefix: "nightly/"
-          Status: "Enabled"
-        - Destination: 
-            Bucket: !Join ["", ["arn:aws:s3:::", !Ref ReplBucketName]]
-          Prefix: "processed/"
-          Status: "Enabled"
-  S3ReplRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - 'sts:AssumeRole'
-            Effect: Allow
-            Principal:
-              Service:
-                - s3.amazonaws.com
-  S3ReplPolicy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyDocument:
-        Statement:
-          - Action:
-              - 's3:GetReplicationConfiguration'
-              - 's3:ListBucket'
-            Effect: Allow
-            Resource:
-              - !Join
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref Bucket
-          - Action:
-              - 's3:GetObjectVersion'
-              - 's3:GetObjectVersionForReplication'
-              - 's3:GetObjectVersionAcl'
-              - 's3:GetObjectVersionTagging'
-            Effect: Allow
-            Resource:
-              - !Join
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref Bucket
-                  - /*
-          - Action:
-              - 's3:ReplicateObject'
-              - 's3:ReplicateDelete'
-              - 's3:ReplicateTags'
-            Effect: Allow
-            Resource:
-              - !Join
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref ReplBucketName
-                  - /*
-      PolicyName: BucketBackupPolicy
-      Roles:
-        - !Ref S3ReplRole
-  NotificationBucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref Bucket
-      PolicyDocument:
-        Statement:
-          - Effect: "Allow"
-            Action:
-            - 's3:PutBucketNotification'
-            - 's3:PutReplicationConfiguration'
-            Resource: !Sub "arn:aws:s3:::${Bucket}"
-            Principal:
-              AWS: !GetAtt BucketConfigFnRole.Arn
-  BucketConfigFnRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal: {Service: [lambda.amazonaws.com]}
-          Action: ['sts:AssumeRole']
-      Path: /
-      ManagedPolicyArns:
-      - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Policies:
-        -
-          PolicyName: "iam-role-s3"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              -
-                Effect: "Allow"
-                Action: 
-                  - "iam:PassRole"
-                  - "iam:GetRole"
-                Resource: 
-                  - !GetAtt S3ReplRole.Arn
-  S3BucketConfiguration:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: S3 Object Custom Resource
-      Handler: index.handler
-      Role: !GetAtt BucketConfigFnRole.Arn
-      Code:
-        ZipFile: !Sub |
-          var response = require('cfn-response');
-          var AWS = require('aws-sdk');
-          var s3 = new AWS.S3();
-          exports.handler = function(event, context) {
-            var respond = (e) => response.send(event, context, e ? response.FAILED : response.SUCCESS, e ? e : {});
-            process.on('uncaughtException', e=>failed(e));
-            var params = event.ResourceProperties;
-            delete params.ServiceToken;
-            if (event.RequestType === 'Delete') {
-              params.NotificationConfiguration = {};
-              s3.putBucketNotificationConfiguration(params).promise()
-                .then((data)=>respond())
-                .catch((e)=>respond());
-            } else {
-              s3.putBucketNotificationConfiguration(params).promise()
-                .then((data)=>respond())
-                .catch((e)=>respond(e));
-            }
-          };
-      Timeout: 30
-      Runtime: nodejs12.x
-  S3BucketReplicationConfiguration:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: S3 Object Custom Resource
-      Handler: index.handler
-      Role: !GetAtt BucketConfigFnRole.Arn
-      Code:
-        ZipFile: !Sub |
-          var response = require('cfn-response');
-          var AWS = require('aws-sdk');
-          var s3 = new AWS.S3();
-          exports.handler = function(event, context) {
-            var respond = (e) => response.send(event, context, e ? response.FAILED : response.SUCCESS, e ? e : {});
-            process.on('uncaughtException', e=>failed(e));
-            var params = event.ResourceProperties;
-            delete params.ServiceToken;
-            if (event.RequestType === 'Delete') {
-              params.ReplicationConfiguration = {};
-              s3.putBucketReplication(params).promise()
-                .then((data)=>respond())
-                .catch((e)=>respond());
-            } else {
-              s3.putBucketReplication(params).promise()
-                .then((data)=>respond())
-                .catch((e)=>respond(e));
-            }
-          };
-      Timeout: 30
-      Runtime: nodejs12.x
-
-  GlueTableNightly:
-    Type: "AWS::Glue::Table"
-    Properties:
-      TableInput:
-        Name: !Ref DbTableNightly
-        StorageDescriptor:
-          StoredAsSubDirectories: false
-          Compressed: False
-          InputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat
-          NumberOfBuckets: -1
-          OutputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat
-          Location: !Join ['', ['s3://', !Ref Bucket, '/nightly/']]
-          SerdeInfo:
-            SerializationLibrary: org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe
-            Parameters: {'serialization.format': '1'}
-          Columns:
-          - Name: coordinates
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: retweeted
-            Type: boolean
-          - Name: source
-            Type: string
-          - Name: entities
-            Type: struct<hashtags:array<struct<text:string,indices:array<bigint>>>,urls:array<struct<url:string,expanded_url:string,display_url:string,indices:array<bigint>>>>
-          - Name: reply_count
-            Type: bigint
-          - Name: favorite_count
-            Type: bigint
-          - Name: geo
-            Type: struct<type:string,coordinates:array<double>>
-          - Name: id_str
-            Type: string
-          - Name: timestamp_ms
-            Type: bigint
-          - Name: truncated
-            Type: boolean
-          - Name: text
-            Type: string
-          - Name: retweet_count
-            Type: bigint
-          - Name: id
-            Type: bigint
-          - Name: possibly_sensitive
-            Type: boolean
-          - Name: filter_level
-            Type: array<string>
-          - Name: created_at
-            Type: string
-          - Name: place
-            Type: struct<id:string,url:string,place_type:array<string>,name:string,full_name:string,country_code:string,country:string,bounding_box:struct<type:string,coordinates:array<array<array<double>>>>>
-          - Name: favorited
-            Type: boolean
-          - Name: lang
-            Type: string
-          - Name: in_reply_to_screen_name
-            Type: string
-          - Name: is_quote_status
-            Type: boolean
-          - Name: in_reply_to_user_id_str
-            Type: string
-          - Name: user
-            Type: struct<id:bigint,id_str:string,name:string,screen_name:string,location:string,url:string,description:string,translator_type:array<string>,protected:boolean,verified:boolean,followers_count:bigint,friends_count:bigint,listed_count:bigint,favourites_count:bigint,statuses_count:bigint,created_at:string,utc_offset:bigint,time_zone:string,geo_enabled:boolean,lang:string,contributors_enabled:boolean,is_translator:boolean,profile_background_color:string,profile_background_image_url:string,profile_background_image_url_https:string,profile_background_tile:boolean,profile_link_color:string,profile_sidebar_border_color:string,profile_sidebar_fill_color:string,profile_text_color:string,profile_use_background_image:boolean,profile_image_url:string,profile_image_url_https:string,profile_banner_url:string,default_profile:boolean,default_profile_image:boolean>
-          - Name: quote_count
-            Type: bigint
-          - Name: year_ingested
-            Type: string
-          - Name: month_ingested
-            Type: string
-          - Name: day_ingested
-            Type: string
-        Parameters: {'classification': 'PARQUET'}
-        TableType: "EXTERNAL_TABLE"
-      DatabaseName: !Ref GlueDB
-      CatalogId: !Ref AWS::AccountId
-
-  CompactionJob:
-    Type: AWS::Glue::Job
-    Properties:
-      Command:
-        Name: glueetl
-        ScriptLocation: !Join ["", ["s3://", !Ref Bucket, "/code/compaction.py"]]
-      MaxRetries: 0
-      MaxCapacity: 10
-      GlueVersion: "2.0"
-      Name: CompactNightly
-      Role: !Ref CompactionJobRole
-
-  CompactionJobRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "glue.amazonaws.com"
-            Action:
-              - "sts:AssumeRole"
-      Path: "/"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole"
-      Policies:
-        -
-          PolicyName: "glue-job-s3"
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              -
-                Effect: "Allow"
-                Action: "s3:*"
-                Resource: 
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket]]
-                  - !Join ["", ["arn:aws:s3:::", !Ref Bucket, "/*"]]
-
-  FailoverRunbook: 
-    Type: AWS::SSM::Document
-    Properties:
-      Content:
-        schemaVersion: '0.3'
-        description: 'Failover an accelerator endpoint'
-        assumeRole: !GetAtt FailoverRunbookRole.Arn
-        parameters:
-          BackupRegion:
-            type: String
-            description: Region that the backup endpoint lives in
-            default: ""
-          BackupEndpoint:
-            type: String
-            description: Backup endpoint ARN
-            default: ""
-        mainSteps:
-        - action: aws:executeAwsApi
-          name: add_endpoint_group
-          inputs:
-            Service: globalaccelerator
-            Api: CreateEndpointGroup
-            ListenerArn: !GetAtt EndpointListener.ListenerArn
-            EndpointGroupRegion: "{{BackupRegion}}"
-            TrafficDialPercentage: 100
-            EndpointConfigurations: 
-            - EndpointId: "{{BackupEndpoint}}"
-              ClientIPPreservationEnabled: True
-              Weight: 100
-        - action: aws:executeAwsApi
-          name: zero_endpoint_group
-          inputs:
-            Service: globalaccelerator
-            Api: UpdateEndpointGroup
-            EndpointGroupArn: !GetAtt EndpointGroup.EndpointGroupArn
-            TrafficDialPercentage: 0
-      DocumentType: Automation
-      Name: 'failover_runbook'
-      DocumentFormat: YAML
-  FailoverRunbookRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Effect: "Allow"
-            Principal:
-              Service:
-                - "ssm.amazonaws.com"
-            Action:
-              - "sts:AssumeRole"
-      Path: "/"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/service-role/AmazonSSMAutomationRole"
-        - "arn:aws:iam::aws:policy/GlobalAcceleratorFullAccess"
-  FailbackRunbook: 
-    Type: AWS::SSM::Document
-    Properties:
-      Content:
-        schemaVersion: '0.3'
-        description: 'Revert an accelerator endpoint'
-        assumeRole: !GetAtt FailoverRunbookRole.Arn
-        parameters:
-          BackupGroupArn:
-            type: String
-            description: "ARN of the backup region's endpoint group ARN"
-            default: ""
-        mainSteps:
-        - action: aws:executeAwsApi
-          name: restore_endpoint_group
-          inputs:
-            Service: globalaccelerator
-            Api: UpdateEndpointGroup
-            EndpointGroupArn: !GetAtt EndpointGroup.EndpointGroupArn
-            TrafficDialPercentage: 100
-        - action: aws:executeAwsApi
-          name: delete_endpoint_group
-          inputs:
-            Service: globalaccelerator
-            Api: DeleteEndpointGroup
-            EndpointGroupArn: "{{BackupGroupArn}}"
-      DocumentType: Automation
-      Name: 'failback_runbook'
-      DocumentFormat: YAML
-
-Outputs:
-  AcceleratorDnsName:
-    Description: Accelerator DNS Name
-    Value:
-      Fn::GetAtt:
-      - GlobalEndpoint 
-      - DnsName
-  VcpId:
-    Description: VPC ID
-    Value: !Ref VPC
-  ProducerInstanceId:
-    Description: EC2 Instance ID for sample producer
-    Value: !Ref SampleProducer
-  PrimaryEndpointArn:
-    Description: ARN of Global Accelerator Endpoint in Primary Region
-    Value: !GetAtt EndpointGroup.EndpointGroupArn
-  AcceleratorListenerArn:
-    Description: ARN of Global Accelerator Listener
-    Value: !GetAtt EndpointListener.ListenerArn
-  ProducerIP:
-    Description: Static IP for producer
-    Value: !Join ["", [!Ref EIPNatGWA, "/32"]]
\ No newline at end of file
diff --git a/static/Reliability/200_Bidirectional_Replication_for_S3/Code/CloudFormation/s3_bucket.yaml b/static/Reliability/200_Bidirectional_Replication_for_S3/Code/CloudFormation/s3_bucket.yaml
deleted file mode 100644
index fe29a09bc..000000000
--- a/static/Reliability/200_Bidirectional_Replication_for_S3/Code/CloudFormation/s3_bucket.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for an encrypted Amazon S3 bucket with CloudTrail logging.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-
-# Parameters
-
-Parameters:
-
-  # NamingPrefix is used to create S3 bucket names, and to name other resources such as IAM Roles
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template including S3 buckets (minimum 5 characters)
-    AllowedPattern: '(?=^.{5,40}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$)'
-    ConstraintDescription: minimum 5 characters; must contain only lowercase letters, numbers, periods (.), and dashes (-)
-
-Resources:
-
-  # ###########
-  # The S3 bucket with encryption that we will use for replication.
-  # and the IAM permissions necessary for replication
-  # ###########
-
-  S3BucketWithEncryption:
-    Type: AWS::S3::Bucket
-    Properties: 
-      AccessControl: Private
-      BucketEncryption: 
-          ServerSideEncryptionConfiguration: 
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: "AES256"
-      BucketName: !Sub '${NamingPrefix}-crrlab-${AWS::Region}'
-      PublicAccessBlockConfiguration: 
-        BlockPublicAcls: true
-        BlockPublicPolicy: true
-        IgnorePublicAcls: true
-        RestrictPublicBuckets: true
-      VersioningConfiguration: 
-        Status: Enabled
-
-  # see https://docs.aws.amazon.com/AmazonS3/latest/dev/setting-repl-config-perm-overview.html for an explanation of this IAM policy
-  S3ReplicationPolicy:
-    Type: AWS::IAM::ManagedPolicy
-    Properties:
-      Description: 'Policy used S3 for replication rules'
-      ManagedPolicyName: !Sub '${NamingPrefix}-S3-Replication-Policy-${AWS::Region}'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-            # Source S3 Bucket
-          - Effect: Allow
-            Action: 
-              - 's3:Get*'
-              - 's3:ListBucket'
-            Resource:
-              - !Sub 'arn:aws:s3:::${NamingPrefix}-crrlab-${AWS::Region}'
-              - !Sub 'arn:aws:s3:::${NamingPrefix}-crrlab-${AWS::Region}/*'
-            # Destination S3 Bucket
-          - Effect: Allow
-            Action:
-              - 's3:ReplicateObject'
-              - 's3:ReplicateDelete'
-              - 's3:ReplicateTags'
-              - 's3:GetObjectVersionTagging'
-            Resource: !Sub 'arn:aws:s3:::${NamingPrefix}-crrlab-*/*'
-
-  S3ReplicationRole:
-    Type: AWS::IAM::Role
-    DependsOn: S3ReplicationPolicy
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-S3-Replication-Role-${AWS::Region}'
-      Path: /
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - s3.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - !Ref S3ReplicationPolicy
-
-  # ###########
-  # Resources necessary to enable CloudTrail logging on the S3 bucket
-  # This includes an S3 bucket and CloudWatch Log Group that will receive the logs
-  # and IAM permissions for CloudTrail to access to
-  # write to the S3 and CloudWatch destinations
-  # ###########
-
-  # CloudTrail trail - enables ongoing delivery of events as log files
-  # Specifically includes events from the S3BucketWithEncryption
-  CloudTrailForLogs:
-    Type: AWS::CloudTrail::Trail
-    DependsOn: 
-      # This must be done first or Trail will fail because it does not have access to the S3 bucket
-      - CloudTrailWriteToS3Policy
-    Properties: 
-      CloudWatchLogsLogGroupArn: !Sub '${CloudWatchLogGroup.Arn}'
-      CloudWatchLogsRoleArn: !Sub '${CloudTrailWriteToLogGroupRole.Arn}'
-      EnableLogFileValidation: false
-      EventSelectors: 
-        - DataResources:
-          - Type: AWS::S3::Object
-            Values:
-              - !Sub 'arn:aws:s3:::${NamingPrefix}-crrlab-${AWS::Region}/'
-          IncludeManagementEvents: false
-          ReadWriteType: WriteOnly
-      IncludeGlobalServiceEvents: false
-      IsLogging: true
-      IsMultiRegionTrail: false
-      S3BucketName: !Ref LoggingBucket
-
-  # S3 bucket to which CloudTrail will send logs
-  LoggingBucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      AccessControl: LogDeliveryWrite
-      BucketName: !Sub 'logging-${NamingPrefix}-${AWS::Region}'
-
-  # CloudWatch Log Group to which CloudTrail will send logs
-  CloudWatchLogGroup:
-    Type: AWS::Logs::LogGroup
-    # Delete the Log Group when the stack is deleted
-    DeletionPolicy: Delete
-    Properties: 
-      LogGroupName: !Sub 'CloudTrail/logs/${NamingPrefix}'
-      RetentionInDays: 30
-
-  # Bucket policy gives CloudTrail permission to write to destination S3 bucket
-  CloudTrailWriteToS3Policy:
-    Type: AWS::S3::BucketPolicy
-    Properties: 
-      Bucket: !Ref LoggingBucket
-      PolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Sid: AWSCloudTrailAclCheck
-          Effect: Allow
-          Principal:
-            Service: 'cloudtrail.amazonaws.com'
-          Action: 's3:GetBucketAcl'
-          Resource: !Sub 'arn:aws:s3:::${LoggingBucket}'
-        - Sid: AWSCloudTrailWrite
-          Effect: Allow
-          Principal:
-            Service: 'cloudtrail.amazonaws.com'
-          Action: 's3:PutObject'
-          Resource: !Sub 'arn:aws:s3:::${LoggingBucket}/AWSLogs/${AWS::AccountId}/*'
-          Condition:
-            StringEquals:
-              's3:x-amz-acl': 'bucket-owner-full-control'
-
-  # IAM Role gives CloudTrail permission to write to destination CloudWatch Log Group
-  CloudTrailWriteToLogGroupRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-CloudTrailWriteToLogGroupRole-${AWS::Region}'
-      Path: /
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - cloudtrail.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Policies:
-        # https://docs.aws.amazon.com/awscloudtrail/latest/userguide/send-cloudtrail-events-to-cloudwatch-logs.html
-        - PolicyName: writeToLogGroup
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Sid: AWSCloudTrailCreateLogStream20141101
-                Effect: Allow
-                Action:
-                  - 'logs:CreateLogStream'
-                Resource:
-                  - !Sub 'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:CloudTrail/logs/${NamingPrefix}:log-stream:*'
-              - Sid: AWSCloudTrailPutLogEvents20141101
-                Effect: Allow
-                Action:
-                  - 'logs:PutLogEvents'
-                Resource:
-                  - !Sub 'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:CloudTrail/logs/${NamingPrefix}:log-stream:*'
-
-# Outputs
-
-Outputs:
-  S3BucketName:
-    Value: !Ref S3BucketWithEncryption
-    Description: S3 Bucket Name
\ No newline at end of file
diff --git a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack.yaml b/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack.yaml
deleted file mode 100644
index a2391e05c..000000000
--- a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack.yaml
+++ /dev/null
@@ -1,285 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a simple VPC and simple static web app. This template installs a web application that is
-  NOT highly-available and NOT scalable. It also does not follow best practices for security.
-  It is kept simple as a tool for learning.
-  This app should NOT be used for production purposes -- it is a learning tool only.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  express or implied. See the License for the specific language governing
-  permissions and limitations under the License.
-
-########################################################################
-
-Parameters:
-  #General:
-
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: SimpleApp1
-
-  # true/false resource switches
-  PublicEnabledParam:
-    Description: 'true if resources to connect VPC to internet should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  EC2SecurityEnabledParam:
-    Description: 'true if resources necessary for EC2 security should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  # S3 Bucket
-  S3BucketName:
-    Type: String
-    Description: The name for the S3 bucket - must be unique across all of AWS (3-63 lowercase letters or numbers)
-    Default: replaceme
-    AllowedPattern: '^[a-z0-9]{3,63}$'
-    ConstraintDescription: 3-63 characters; must contain only lowercase letters or numbers
-
-  # IP configuration
-  VPCCidrBlock:
-    Description: 'CIDR IP for VPC'
-    Type: String
-    Default: 10.0.0.0/16
-
-  PublicCidrBlock1:
-    Description: 'CIDR IP for public subnet'
-    Type: String
-    Default: 10.0.1.0/24
-
-  PublicSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-
-  #Application Tier
-  LatestAmiId:
-    Description: Gets the latest AMI from Systems Manager Parameter store
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t2.nano
-      - t2.micro
-      - t2.small
-    ConstraintDescription: must be a valid EC2 instance type.
-
-########################################################################
-
-Conditions:
-  # Create resources to connect VPC to the internet
-  PublicEnabled: !Equals [!Ref PublicEnabledParam, "true"]
-
-  # Create security resources needed for an EC2 instances
-  EC2SecurityEnabled: !Equals [!Ref EC2SecurityEnabledParam, "true"]
-
-########################################################################
-
-Resources:
-  ###########
-  # VPC with Internet Gateway
-  ###########
-
-  #VPC
-  SimpleVPC:
-    Type: AWS::EC2::VPC
-    Properties:
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
-      CidrBlock: !Ref VPCCidrBlock
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - VPC
-
-  #Internet Gateway: Allows communication between instances in your VPC and the internet.
-  IGW:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - IGW
-  IGWAttach:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref SimpleVPC
-      InternetGatewayId: !Ref IGW
-      #VpnGatewayId
-
-
-  ###########
-  # Route Table to Internet
-  ###########
-
-  # Route to/from Internet
-  InternetRoute:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Route
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-      RouteTableId: !Ref InternetRouteTable
-
-  InternetRouteTable:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref SimpleVPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - RTB
-
-  ###########
-  # Public Subnet
-  ###########
-
-  PublicSubnet1:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Subnet
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      VpcId: !Ref SimpleVPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicCidrBlock1
-      MapPublicIpOnLaunch: false
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - 1
-
-  PublicSubnet1RouteToInternet:
-    Condition: PublicEnabled
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - PublicSubnet1
-      - InternetRouteTable
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref PublicSubnet1
-
-###########
-# App Security Group
-###########
-
-  PublicSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Condition: EC2SecurityEnabled
-    Properties:
-      VpcId: !Ref SimpleVPC
-      GroupName: !Join
-        - '-'
-        - - !Ref NamingPrefix
-          - SG
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref PublicSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref PublicSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - SG
-
-########################################################################
-
-Outputs:
-
-  SimpleVPCId:
-    Value: !Ref SimpleVPC
-
-########################################################################
-# Metadata is used to group and order how the CloudFormation parameters are
-# displayed when you deploy the template using the AWS Console
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      -
-        Label:
-          default: "Naming"
-        Parameters:
-          - NamingPrefix
-      -
-        Label:
-          default: "true/false switches"
-        Parameters:
-          - PublicEnabledParam
-          - EC2SecurityEnabledParam
-      -
-        Label:
-          default: "S3 bucket"
-        Parameters:
-          - S3BucketName
-      -
-        Label:
-          default: "IP configuration (CIDR)"
-        Parameters:
-          - VPCCidrBlock
-          - PublicCidrBlock1
-          - PublicSGSource
-      -
-        Label:
-          default: "EC2 configuration"
-        Parameters:
-          - LatestAmiId
-          - InstanceType
diff --git a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3.yaml b/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3.yaml
deleted file mode 100644
index 76f2fa821..000000000
--- a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3.yaml
+++ /dev/null
@@ -1,297 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a simple VPC and simple static web app. This template installs a web application that is
-  NOT highly-available and NOT scalable. It also does not follow best practices for security.
-  It is kept simple as a tool for learning.
-  This app should NOT be used for production purposes -- it is a learning tool only.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  express or implied. See the License for the specific language governing
-  permissions and limitations under the License.
-
-########################################################################
-
-Parameters:
-  #General:
-
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: SimpleApp1
-
-  # true/false resource switches
-  PublicEnabledParam:
-    Description: 'true if resources to connect VPC to internet should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  EC2SecurityEnabledParam:
-    Description: 'true if resources necessary for EC2 security should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  # S3 Bucket
-  S3BucketName:
-    Type: String
-    Description: The name for the S3 bucket - must be unique across all of AWS (3-63 lowercase letters or numbers)
-    Default: replaceme
-    AllowedPattern: '^[a-z0-9]{3,63}$'
-    ConstraintDescription: 3-63 characters; must contain only lowercase letters or numbers
-
-  # IP configuration
-  VPCCidrBlock:
-    Description: 'CIDR IP for VPC'
-    Type: String
-    Default: 10.0.0.0/16
-
-  PublicCidrBlock1:
-    Description: 'CIDR IP for public subnet'
-    Type: String
-    Default: 10.0.1.0/24
-
-  PublicSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-
-  #Application Tier
-  LatestAmiId:
-    Description: Gets the latest AMI from Systems Manager Parameter store
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t2.nano
-      - t2.micro
-      - t2.small
-    ConstraintDescription: must be a valid EC2 instance type.
-
-########################################################################
-
-Conditions:
-  # Create resources to connect VPC to the internet
-  PublicEnabled: !Equals [!Ref PublicEnabledParam, "true"]
-
-  # Create security resources needed for an EC2 instances
-  EC2SecurityEnabled: !Equals [!Ref EC2SecurityEnabledParam, "true"]
-
-########################################################################
-
-Resources:
-
-  ###########
-  # Student added resources
-  ###########
-  MyS3Bucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Join
-        - '-'
-        - - !Ref S3BucketName
-          - !Ref 'AWS::Region'
-
-  ###########
-  # VPC with Internet Gateway
-  ###########
-
-  #VPC
-  SimpleVPC:
-    Type: AWS::EC2::VPC
-    Properties:
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
-      CidrBlock: !Ref VPCCidrBlock
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - VPC
-
-  #Internet Gateway: Allows communication between instances in your VPC and the internet.
-  IGW:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - IGW
-  IGWAttach:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref SimpleVPC
-      InternetGatewayId: !Ref IGW
-      #VpnGatewayId
-
-
-  ###########
-  # Route Table to Internet
-  ###########
-
-  # Route to/from Internet
-  InternetRoute:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Route
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-      RouteTableId: !Ref InternetRouteTable
-
-  InternetRouteTable:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref SimpleVPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - RTB
-
-  ###########
-  # Public Subnet
-  ###########
-
-  PublicSubnet1:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Subnet
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      VpcId: !Ref SimpleVPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicCidrBlock1
-      MapPublicIpOnLaunch: false
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - 1
-
-  PublicSubnet1RouteToInternet:
-    Condition: PublicEnabled
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - PublicSubnet1
-      - InternetRouteTable
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref PublicSubnet1
-
-###########
-# App Security Group
-###########
-
-  PublicSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Condition: EC2SecurityEnabled
-    Properties:
-      VpcId: !Ref SimpleVPC
-      GroupName: !Join
-        - '-'
-        - - !Ref NamingPrefix
-          - SG
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref PublicSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref PublicSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - SG
-
-########################################################################
-
-Outputs:
-
-  SimpleVPCId:
-    Value: !Ref SimpleVPC
-
-########################################################################
-# Metadata is used to group and order how the CloudFormation parameters are
-# displayed when you deploy the template using the AWS Console
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      -
-        Label:
-          default: "Naming"
-        Parameters:
-          - NamingPrefix
-      -
-        Label:
-          default: "true/false switches"
-        Parameters:
-          - PublicEnabledParam
-          - EC2SecurityEnabledParam
-      -
-        Label:
-          default: "S3 bucket"
-        Parameters:
-          - S3BucketName
-      -
-        Label:
-          default: "IP configuration (CIDR)"
-        Parameters:
-          - VPCCidrBlock
-          - PublicCidrBlock1
-          - PublicSGSource
-      -
-        Label:
-          default: "EC2 configuration"
-        Parameters:
-          - LatestAmiId
-          - InstanceType
diff --git a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2.yaml b/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2.yaml
deleted file mode 100644
index 5d72b1abb..000000000
--- a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2.yaml
+++ /dev/null
@@ -1,310 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a simple VPC and simple static web app. This template installs a web application that is
-  NOT highly-available and NOT scalable. It also does not follow best practices for security.
-  It is kept simple as a tool for learning.
-  This app should NOT be used for production purposes -- it is a learning tool only.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  express or implied. See the License for the specific language governing
-  permissions and limitations under the License.
-
-########################################################################
-
-Parameters:
-  #General:
-
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: SimpleApp1
-
-  # true/false resource switches
-  PublicEnabledParam:
-    Description: 'true if resources to connect VPC to internet should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  EC2SecurityEnabledParam:
-    Description: 'true if resources necessary for EC2 security should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  # S3 Bucket
-  S3BucketName:
-    Type: String
-    Description: The name for the S3 bucket - must be unique across all of AWS (3-63 lowercase letters or numbers)
-    Default: replaceme
-    AllowedPattern: '^[a-z0-9]{3,63}$'
-    ConstraintDescription: 3-63 characters; must contain only lowercase letters or numbers
-
-  # IP configuration
-  VPCCidrBlock:
-    Description: 'CIDR IP for VPC'
-    Type: String
-    Default: 10.0.0.0/16
-
-  PublicCidrBlock1:
-    Description: 'CIDR IP for public subnet'
-    Type: String
-    Default: 10.0.1.0/24
-
-  PublicSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-
-  #Application Tier
-  LatestAmiId:
-    Description: Gets the latest AMI from Systems Manager Parameter store
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t2.nano
-      - t2.micro
-      - t2.small
-    ConstraintDescription: must be a valid EC2 instance type.
-
-########################################################################
-
-Conditions:
-  # Create resources to connect VPC to the internet
-  PublicEnabled: !Equals [!Ref PublicEnabledParam, "true"]
-
-  # Create security resources needed for an EC2 instances
-  EC2SecurityEnabled: !Equals [!Ref EC2SecurityEnabledParam, "true"]
-
-########################################################################
-
-Resources:
-
-  ###########
-  # Student added resources
-  ###########
-
-  MyS3Bucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Join
-        - '-'
-        - - !Ref S3BucketName
-          - !Ref 'AWS::Region'
-
-  MyEC2Instance:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: !Ref InstanceType
-      SecurityGroupIds:
-        - !Ref PublicSecurityGroup
-      SubnetId: !Ref PublicSubnet1
-      Tags:
-        - Key: Name
-          Value: Simple Server
-
-  ###########
-  # VPC with Internet Gateway
-  ###########
-
-  #VPC
-  SimpleVPC:
-    Type: AWS::EC2::VPC
-    Properties:
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
-      CidrBlock: !Ref VPCCidrBlock
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - VPC
-
-  #Internet Gateway: Allows communication between instances in your VPC and the internet.
-  IGW:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - IGW
-  IGWAttach:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref SimpleVPC
-      InternetGatewayId: !Ref IGW
-      #VpnGatewayId
-
-
-  ###########
-  # Route Table to Internet
-  ###########
-
-  # Route to/from Internet
-  InternetRoute:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Route
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-      RouteTableId: !Ref InternetRouteTable
-
-  InternetRouteTable:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref SimpleVPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - RTB
-
-  ###########
-  # Public Subnet
-  ###########
-
-  PublicSubnet1:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Subnet
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      VpcId: !Ref SimpleVPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicCidrBlock1
-      MapPublicIpOnLaunch: false
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - 1
-
-  PublicSubnet1RouteToInternet:
-    Condition: PublicEnabled
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - PublicSubnet1
-      - InternetRouteTable
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref PublicSubnet1
-
-###########
-# App Security Group
-###########
-
-  PublicSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Condition: EC2SecurityEnabled
-    Properties:
-      VpcId: !Ref SimpleVPC
-      GroupName: !Join
-        - '-'
-        - - !Ref NamingPrefix
-          - SG
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref PublicSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref PublicSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - SG
-
-########################################################################
-
-Outputs:
-
-  SimpleVPCId:
-    Value: !Ref SimpleVPC
-
-########################################################################
-# Metadata is used to group and order how the CloudFormation parameters are
-# displayed when you deploy the template using the AWS Console
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      -
-        Label:
-          default: "Naming"
-        Parameters:
-          - NamingPrefix
-      -
-        Label:
-          default: "true/false switches"
-        Parameters:
-          - PublicEnabledParam
-          - EC2SecurityEnabledParam
-      -
-        Label:
-          default: "S3 bucket"
-        Parameters:
-          - S3BucketName
-      -
-        Label:
-          default: "IP configuration (CIDR)"
-        Parameters:
-          - VPCCidrBlock
-          - PublicCidrBlock1
-          - PublicSGSource
-      -
-        Label:
-          default: "EC2 configuration"
-        Parameters:
-          - LatestAmiId
-          - InstanceType
diff --git a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2_server.yaml b/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2_server.yaml
deleted file mode 100644
index f687aafec..000000000
--- a/static/Reliability/200_Deploy_and_Update_CloudFormation/Code/CloudFormation/simple_stack_plus_s3_ec2_server.yaml
+++ /dev/null
@@ -1,325 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a simple VPC and simple static web app. This template installs a web application that is
-  NOT highly-available and NOT scalable. It also does not follow best practices for security.
-  It is kept simple as a tool for learning.
-  This app should NOT be used for production purposes -- it is a learning tool only.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  express or implied. See the License for the specific language governing
-  permissions and limitations under the License.
-
-########################################################################
-
-Parameters:
-  #General:
-
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: SimpleApp1
-
-  # true/false resource switches
-  PublicEnabledParam:
-    Description: 'true if resources to connect VPC to internet should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  EC2SecurityEnabledParam:
-    Description: 'true if resources necessary for EC2 security should be deployed'
-    Type: String
-    AllowedValues:
-      - true
-      - false
-    Default: false
-
-  # S3 Bucket
-  S3BucketName:
-    Type: String
-    Description: The name for the S3 bucket - must be unique across all of AWS (3-63 lowercase letters or numbers)
-    Default: replaceme
-    AllowedPattern: '^[a-z0-9]{3,63}$'
-    ConstraintDescription: 3-63 characters; must contain only lowercase letters or numbers
-
-  # IP configuration
-  VPCCidrBlock:
-    Description: 'CIDR IP for VPC'
-    Type: String
-    Default: 10.0.0.0/16
-
-  PublicCidrBlock1:
-    Description: 'CIDR IP for public subnet'
-    Type: String
-    Default: 10.0.1.0/24
-
-  PublicSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-
-  #Application Tier
-  LatestAmiId:
-    Description: Gets the latest AMI from Systems Manager Parameter store
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t2.nano
-      - t2.micro
-      - t2.small
-    ConstraintDescription: must be a valid EC2 instance type.
-
-########################################################################
-
-Conditions:
-  # Create resources to connect VPC to the internet
-  PublicEnabled: !Equals [!Ref PublicEnabledParam, "true"]
-
-  # Create security resources needed for an EC2 instances
-  EC2SecurityEnabled: !Equals [!Ref EC2SecurityEnabledParam, "true"]
-
-########################################################################
-
-Resources:
-
-  ###########
-  # Student added resources
-  ###########
-
-  MyS3Bucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Join
-        - '-'
-        - - !Ref S3BucketName
-          - !Ref 'AWS::Region'
-
-  MyEC2Instance:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: !Ref InstanceType
-      Tags:
-        - Key: Name
-          Value: Simple Server
-      NetworkInterfaces:
-        - AssociatePublicIpAddress: "true"
-          DeviceIndex: "0"
-          GroupSet:
-            - Ref: PublicSecurityGroup
-          SubnetId:
-            Ref: PublicSubnet1
-      UserData:
-        Fn::Base64:
-          !Sub |
-            #!/bin/bash -xe
-            yum -y update
-            sudo yum install -y httpd
-            sudo systemctl start httpd
-            sudo echo '<h1>Hello from ${AWS::Region}</h1>' > /var/www/html/index.html
-
-  ###########
-  # VPC with Internet Gateway
-  ###########
-
-  #VPC
-  SimpleVPC:
-    Type: AWS::EC2::VPC
-    Properties:
-      #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
-      CidrBlock: !Ref VPCCidrBlock
-      EnableDnsSupport: true
-      EnableDnsHostnames: true
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - VPC
-
-  #Internet Gateway: Allows communication between instances in your VPC and the internet.
-  IGW:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - IGW
-  IGWAttach:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref SimpleVPC
-      InternetGatewayId: !Ref IGW
-      #VpnGatewayId
-
-
-  ###########
-  # Route Table to Internet
-  ###########
-
-  # Route to/from Internet
-  InternetRoute:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Route
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-    Properties:
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref IGW
-      RouteTableId: !Ref InternetRouteTable
-
-  InternetRouteTable:
-    Condition: PublicEnabled
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref SimpleVPC
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - RTB
-
-  ###########
-  # Public Subnet
-  ###########
-
-  PublicSubnet1:
-    Condition: PublicEnabled
-    Type: AWS::EC2::Subnet
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-    Properties:
-      VpcId: !Ref SimpleVPC
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-          Ref: 'AWS::Region'
-      CidrBlock: !Ref PublicCidrBlock1
-      MapPublicIpOnLaunch: false
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Public
-              - 1
-
-  PublicSubnet1RouteToInternet:
-    Condition: PublicEnabled
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-    DependsOn:
-      - PublicSubnet1
-      - InternetRouteTable
-    Properties:
-      RouteTableId: !Ref InternetRouteTable
-      SubnetId: !Ref PublicSubnet1
-
-###########
-# App Security Group
-###########
-
-  PublicSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Condition: EC2SecurityEnabled
-    Properties:
-      VpcId: !Ref SimpleVPC
-      GroupName: !Join
-        - '-'
-        - - !Ref NamingPrefix
-          - SG
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref PublicSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref PublicSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - SG
-
-########################################################################
-
-Outputs:
-
-  SimpleVPCId:
-    Value: !Ref SimpleVPC
-
-  PublicServerDNS:
-    Value: !GetAtt MyEC2Instance.PublicDnsName
-
-########################################################################
-# Metadata is used to group and order how the CloudFormation parameters are
-# displayed when you deploy the template using the AWS Console
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      -
-        Label:
-          default: "Naming"
-        Parameters:
-          - NamingPrefix
-      -
-        Label:
-          default: "true/false switches"
-        Parameters:
-          - PublicEnabledParam
-          - EC2SecurityEnabledParam
-      -
-        Label:
-          default: "S3 bucket"
-        Parameters:
-          - S3BucketName
-      -
-        Label:
-          default: "IP configuration (CIDR)"
-        Parameters:
-          - VPCCidrBlock
-          - PublicCidrBlock1
-          - PublicSGSource
-      -
-        Label:
-          default: "EC2 configuration"
-        Parameters:
-          - LatestAmiId
-          - InstanceType
diff --git a/static/Reliability/200_Testing_Backup_and_Restore_of_Data/Code/backup-lab.yaml b/static/Reliability/200_Testing_Backup_and_Restore_of_Data/Code/backup-lab.yaml
deleted file mode 100644
index 901401fdb..000000000
--- a/static/Reliability/200_Testing_Backup_and_Restore_of_Data/Code/backup-lab.yaml
+++ /dev/null
@@ -1,243 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template to create lab resources. Creates an EC2
-  Instance, an SNS Topic, and a Lambda Function in a new VPC.
-
-  **WARNING** You will be billed for the AWS resources created if you create a
-  stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License"). You may not
-  use this file except in compliance with the License. A copy of the License is
-  located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed  on
-  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-  or implied. See the License for the specific language governing permissions
-  and limitations under the License.
-Parameters:
-  NotificationEmail:
-    Type: String
-    Description: The email address to which backup and restore notifications are published.
-  AvailabilityZone:
-    Type: 'AWS::EC2::AvailabilityZone::Name'
-    Description: The Availability Zone in which resources are launched.
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-Resources:
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      Tags:
-        - Key: Name
-          Value: WA-Lab-VPC
-  Subnet:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Ref AvailabilityZone
-      CidrBlock: 10.0.0.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet
-  InternetGateway:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: WA-Lab-InternetGateway
-  VPCGatewayAttachment:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-  RouteTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: WA-Lab-RouteTable
-  Route:
-    Type: 'AWS::EC2::Route'
-    DependsOn: VPCGatewayAttachment
-    Properties:
-      RouteTableId: !Ref RouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-  RouteTableAssociation:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet
-  InstanceSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Inbound HTTP access
-      SecurityGroupIngress:
-        - CidrIp: 0.0.0.0/0
-          FromPort: '80'
-          IpProtocol: tcp
-          ToPort: '80'
-      SecurityGroupEgress:
-        - CidrIp: 0.0.0.0/0
-          IpProtocol: '-1'
-      VpcId: !Ref VPC
-  Instance:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      SubnetId: !Ref Subnet
-      SecurityGroupIds:
-        - !Ref InstanceSecurityGroup
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum install httpd -y
-            - >
-              echo '<h1>AWS Backup is Awesome!!</h1>' >>
-              /var/www/html/index.html
-            - |
-              systemctl start httpd.service
-            - systemctl enable httpd.service
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Instance
-        - Key: workload
-          Value: myapp
-  SNSTopic:
-    Type: 'AWS::SNS::Topic'
-    Properties:
-      TopicName: !Join
-        - '-'
-        - - BackupNotificationTopic
-          - !Ref 'AWS::StackName'
-      Subscription:
-        - Endpoint: !Ref NotificationEmail
-          Protocol: email
-  LambdaFunction:
-    Type: 'AWS::Lambda::Function'
-    Properties:
-      FunctionName: !Join
-        - '-'
-        - - RestoreTestFunction
-          - !Ref 'AWS::StackName'
-      Handler: lambda_function.lambda_handler
-      Role: !GetAtt
-        - LambdaRole
-        - Arn
-      Runtime: python3.8
-      Timeout: '60'
-      Code:
-        S3Bucket: aws-well-architected-labs-virginia
-        S3Key: Reliability/200_Testing_Backup_and_Restore_of_Data/lambda_function.zip
-  LambdaRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AWSBackupOperatorAccess'
-        - 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
-      Policies:
-        - PolicyName: !Join
-            - '-'
-            - - LambdaPolicy
-              - !Ref 'AWS::StackName'
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Sid: VisualEditor0
-                Effect: Allow
-                Action:
-                  - 'ec2:DescribeInstances'
-                  - 'ec2:TerminateInstances'
-                Resource: '*'
-              - Sid: VisualEditor1
-                Effect: Allow
-                Action: 'sns:Publish'
-                Resource: !Ref SNSTopic
-  LambdaPermission:
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:InvokeFunction'
-      FunctionName: !Ref LambdaFunction
-      Principal: sns.amazonaws.com
-      SourceArn: !Ref SNSTopic
-  SNSSubscription:
-    Type: 'AWS::SNS::Subscription'
-    Properties:
-      Endpoint: !GetAtt
-        - LambdaFunction
-        - Arn
-      Protocol: lambda
-      TopicArn: !Ref SNSTopic
-  SNSTopicPolicy:
-    Type: 'AWS::SNS::TopicPolicy'
-    Properties:
-      Topics:
-        - !Ref SNSTopic
-      PolicyDocument:
-        Version: 2008-10-17
-        Id: __default_policy_ID
-        Statement:
-          - Sid: __default_statement_ID
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action:
-              - 'SNS:GetTopicAttributes'
-              - 'SNS:SetTopicAttributes'
-              - 'SNS:AddPermission'
-              - 'SNS:RemovePermission'
-              - 'SNS:DeleteTopic'
-              - 'SNS:Subscribe'
-              - 'SNS:ListSubscriptionsByTopic'
-              - 'SNS:Publish'
-              - 'SNS:Receive'
-            Resource: !Ref SNSTopic
-            Condition:
-              StringEquals:
-                'AWS:SourceOwner': !Ref 'AWS::AccountId'
-          - Sid: backup
-            Effect: Allow
-            Principal:
-              Service: backup.amazonaws.com
-            Action: 'SNS:Publish'
-            Resource: !Ref SNSTopic
-          - Sid: lambda
-            Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'SNS:Publish'
-            Resource: !Ref SNSTopic
-Outputs:
-  InstanceID:
-    Description: EC2 Instance ID
-    Value: !Ref Instance
-  ApplicationURL:
-    Description: URL for the application running on the EC2 Instance
-    Value: !Join
-      - ''
-      - - 'http://'
-        - !GetAtt
-          - Instance
-          - PublicIp
-  SNSTopicARN:
-    Description: SNS Topic ARN
-    Value: !Ref SNSTopic
diff --git a/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/regular.yaml b/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/regular.yaml
deleted file mode 100644
index 74f8711ed..000000000
--- a/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/regular.yaml
+++ /dev/null
@@ -1,1033 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template to create lab resources. Creates an
-  Application Load Balancer, Target Groups, and EC2 instances in a new VPC.
-
-  **WARNING** You will be billed for the AWS resources created if you create a
-  stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License"). You may not
-  use this file except in compliance with the License. A copy of the License is
-  located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed  on
-  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-  or implied. See the License for the specific language governing permissions
-  and limitations under the License.
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-Resources:
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      Tags:
-        - Key: Name
-          Value: WA-Lab-VPC
-  Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs ''
-      CidrBlock: 10.0.0.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet-1
-  Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs ''
-      CidrBlock: 10.0.1.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet-2
-  InternetGateway:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: WA-Lab-InternetGateway
-  VPCGatewayAttachment:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-  RouteTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: WA-Lab-RouteTable
-  Route:
-    Type: 'AWS::EC2::Route'
-    DependsOn: VPCGatewayAttachment
-    Properties:
-      RouteTableId: !Ref RouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-  RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet1
-  RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet2
-  SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Inbound HTTP for WA Lab
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: '-1'
-          FromPort: '-1'
-          ToPort: '-1'
-          CidrIp: 0.0.0.0/0
-  Instance1:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-1
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance2:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-2
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance3:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-3
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance4:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-4
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance5:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-5
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance6:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-6
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance7:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-7
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance8:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-8
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Roles:
-        - !Ref InstanceRole
-  InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ec2.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-      Policies:
-        - PolicyName: readtag
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'ec2:DescribeTags'
-                Resource: '*'
-  TargetGroupAllTargets:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance1
-          Port: '80'
-        - Id: !Ref Instance2
-          Port: '80'
-        - Id: !Ref Instance3
-          Port: '80'
-        - Id: !Ref Instance4
-          Port: '80'
-        - Id: !Ref Instance5
-          Port: '80'
-        - Id: !Ref Instance6
-          Port: '80'
-        - Id: !Ref Instance7
-          Port: '80'
-        - Id: !Ref Instance8
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  ALB:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    Properties:
-      SecurityGroups:
-        - !Ref SecurityGroup
-      Subnets:
-        - !Ref Subnet1
-        - !Ref Subnet2
-    DependsOn:
-      - VPCGatewayAttachment
-  ALBListener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    Properties:
-      DefaultActions:
-        - FixedResponseConfig:
-            MessageBody: Invalid Request. Please include customer name in the request.
-            StatusCode: '400'
-          Type: fixed-response
-      LoadBalancerArn: !Ref ALB
-      Port: '80'
-      Protocol: HTTP
-  ALBListenerRule1:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroupAllTargets
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Alpha
-              - Key: name
-                Value: Bravo
-              - Key: name
-                Value: Charlie
-              - Key: name
-                Value: Delta
-      ListenerArn: !Ref ALBListener
-      Priority: '1'
-  ALBListenerRule2:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroupAllTargets
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Echo
-              - Key: name
-                Value: Foxtrot
-              - Key: name
-                Value: Golf
-              - Key: name
-                Value: Hotel
-      ListenerArn: !Ref ALBListener
-      Priority: '2'
-  SSMDocument:
-    Type: 'AWS::SSM::Document'
-    Properties:
-      Content:
-        schemaVersion: '2.2'
-        description: State Manager Bootstrap Example
-        parameters: {}
-        mainSteps:
-          - action: 'aws:runShellScript'
-            name: configureServer
-            inputs:
-              runCommand:
-                - >-
-                  sudo nohup python /home/ec2-user/buggy-webserver.py >>
-                  /var/log/webserver.log 2>&1 &
-      DocumentType: Command
-  CanaryBucket:
-    Type: 'AWS::S3::Bucket'
-  CanaryRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Policies:
-        - PolicyName: SyntheticsCanary
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 's3:PutObject'
-                  - 's3:GetObject'
-                Resource:
-                  - !Join
-                    - ''
-                    - - 'arn:aws:s3:::'
-                      - !Ref CanaryBucket
-                      - /*
-              - Effect: Allow
-                Action:
-                  - 's3:GetBucketLocation'
-                Resource:
-                  - !GetAtt
-                    - CanaryBucket
-                    - Arn
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                  - 'logs:CreateLogGroup'
-                Resource:
-                  - '*'
-              - Effect: Allow
-                Action:
-                  - 's3:ListAllMyBuckets'
-                  - 'xray:PutTraceSegments'
-                Resource:
-                  - '*'
-              - Effect: Allow
-                Resource: '*'
-                Action: 'cloudwatch:PutMetricData'
-                Condition:
-                  StringEquals:
-                    'cloudwatch:namespace': CloudWatchSynthetics
-  AlphaCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: alpha
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Alpha";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  BravoCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: bravo
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Bravo";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  CharlieCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: charlie
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Charlie";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  DeltaCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: delta
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Delta";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  EchoCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: echo
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Echo";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  FoxtrotCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: foxtrot
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Foxtrot";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  GolfCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: golf
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Golf";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  HotelCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: hotel
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Hotel";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroupAllTargets
-  CanaryDashboard:
-    Type: 'AWS::CloudWatch::Dashboard'
-    Properties:
-      DashboardName: Customer-availability
-      DashboardBody: !Sub >-
-        {"widgets":[{"type":"metric","x":0,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","alpha"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Alpha"}},{"type":"metric","x":6,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","bravo"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Bravo"}},{"type":"metric","x":12,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","charlie"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Charlie"}},{"type":"metric","x":18,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","delta"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Delta"}},{"type":"metric","x":0,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","echo"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Echo"}},{"type":"metric","x":6,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","foxtrot"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Foxtrot"}},{"type":"metric","x":12,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","golf"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Golf"}},{"type":"metric","x":18,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","hotel"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Hotel"}}]}
-Outputs:
-  SSMDocument:
-    Value: !Join
-      - ''
-      - - 'https://console.aws.amazon.com/systems-manager/documents/'
-        - !Ref SSMDocument
-        - /description?region=
-        - !Ref 'AWS::Region'
-  CustomerAlpha:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Alpha
-  CustomerBravo:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Bravo
-  CustomerCharlie:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Charlie
-  CustomerDelta:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Delta
-  CustomerEcho:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Echo
-  CustomerFoxtrot:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Foxtrot
-  CustomerGolf:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Golf
-  CustomerHotel:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Hotel
-  AvailabilityDashboard:
-    Value: !Join
-      - ''
-      - - https://console.aws.amazon.com/cloudwatch/home#dashboards:name=
-        - !Ref CanaryDashboard
diff --git a/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/sharding.yaml b/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/sharding.yaml
deleted file mode 100644
index 485eda7d2..000000000
--- a/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/sharding.yaml
+++ /dev/null
@@ -1,1132 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template to create lab resources. Creates an
-  Application Load Balancer, Target Groups, and EC2 instances in a new VPC.
-
-  **WARNING** You will be billed for the AWS resources created if you create a
-  stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License"). You may not
-  use this file except in compliance with the License. A copy of the License is
-  located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed  on
-  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-  or implied. See the License for the specific language governing permissions
-  and limitations under the License.
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-Resources:
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      Tags:
-        - Key: Name
-          Value: WA-Lab-VPC
-  Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs ''
-      CidrBlock: 10.0.0.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet-1
-  Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs ''
-      CidrBlock: 10.0.1.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet-2
-  InternetGateway:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: WA-Lab-InternetGateway
-  VPCGatewayAttachment:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-  RouteTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: WA-Lab-RouteTable
-  Route:
-    Type: 'AWS::EC2::Route'
-    DependsOn: VPCGatewayAttachment
-    Properties:
-      RouteTableId: !Ref RouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-  RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet1
-  RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet2
-  SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Inbound HTTP for WA Lab
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: '-1'
-          FromPort: '-1'
-          ToPort: '-1'
-          CidrIp: 0.0.0.0/0
-  Instance1:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-1
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance2:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-2
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance3:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-3
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance4:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-4
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance5:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-5
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance6:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-6
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance7:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-7
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance8:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-8
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Roles:
-        - !Ref InstanceRole
-  InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ec2.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-      Policies:
-        - PolicyName: readtag
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'ec2:DescribeTags'
-                Resource: '*'
-  TargetGroup1:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance1
-          Port: '80'
-        - Id: !Ref Instance2
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup2:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance3
-          Port: '80'
-        - Id: !Ref Instance4
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup3:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance5
-          Port: '80'
-        - Id: !Ref Instance6
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup4:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance7
-          Port: '80'
-        - Id: !Ref Instance8
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  ALB:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    Properties:
-      SecurityGroups:
-        - !Ref SecurityGroup
-      Subnets:
-        - !Ref Subnet1
-        - !Ref Subnet2
-    DependsOn:
-      - VPCGatewayAttachment
-  ALBListener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    Properties:
-      DefaultActions:
-        - FixedResponseConfig:
-            MessageBody: Invalid Request. Please include customer name in the request.
-            StatusCode: '400'
-          Type: fixed-response
-      LoadBalancerArn: !Ref ALB
-      Port: '80'
-      Protocol: HTTP
-  ALBListenerRule1:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup1
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Alpha
-              - Key: name
-                Value: Bravo
-      ListenerArn: !Ref ALBListener
-      Priority: '1'
-  ALBListenerRule2:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup2
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Charlie
-              - Key: name
-                Value: Delta
-      ListenerArn: !Ref ALBListener
-      Priority: '2'
-  ALBListenerRule3:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup3
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Echo
-              - Key: name
-                Value: Foxtrot
-      ListenerArn: !Ref ALBListener
-      Priority: '3'
-  ALBListenerRule4:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup4
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Golf
-              - Key: name
-                Value: Hotel
-      ListenerArn: !Ref ALBListener
-      Priority: '4'
-  SSMDocument:
-    Type: 'AWS::SSM::Document'
-    Properties:
-      Content:
-        schemaVersion: '2.2'
-        description: State Manager Bootstrap Example
-        parameters: {}
-        mainSteps:
-          - action: 'aws:runShellScript'
-            name: configureServer
-            inputs:
-              runCommand:
-                - >-
-                  sudo nohup python /home/ec2-user/buggy-webserver.py >>
-                  /var/log/webserver.log 2>&1 &
-      DocumentType: Command
-  CanaryBucket:
-    Type: 'AWS::S3::Bucket'
-  CanaryRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Policies:
-        - PolicyName: SyntheticsCanary
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 's3:PutObject'
-                  - 's3:GetObject'
-                Resource:
-                  - !Join
-                    - ''
-                    - - 'arn:aws:s3:::'
-                      - !Ref CanaryBucket
-                      - /*
-              - Effect: Allow
-                Action:
-                  - 's3:GetBucketLocation'
-                Resource:
-                  - !GetAtt
-                    - CanaryBucket
-                    - Arn
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                  - 'logs:CreateLogGroup'
-                Resource:
-                  - '*'
-              - Effect: Allow
-                Action:
-                  - 's3:ListAllMyBuckets'
-                  - 'xray:PutTraceSegments'
-                Resource:
-                  - '*'
-              - Effect: Allow
-                Resource: '*'
-                Action: 'cloudwatch:PutMetricData'
-                Condition:
-                  StringEquals:
-                    'cloudwatch:namespace': CloudWatchSynthetics
-  AlphaCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: alpha
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Alpha";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  BravoCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: bravo
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Bravo";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  CharlieCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: charlie
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Charlie";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  DeltaCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: delta
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Delta";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  EchoCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: echo
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Echo";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  FoxtrotCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: foxtrot
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Foxtrot";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  GolfCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: golf
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Golf";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  HotelCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: hotel
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Hotel";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-  CanaryDashboard:
-    Type: 'AWS::CloudWatch::Dashboard'
-    Properties:
-      DashboardName: Customer-availability
-      DashboardBody: !Sub >-
-        {"widgets":[{"type":"metric","x":0,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","alpha"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Alpha"}},{"type":"metric","x":6,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","bravo"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Bravo"}},{"type":"metric","x":12,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","charlie"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Charlie"}},{"type":"metric","x":18,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","delta"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Delta"}},{"type":"metric","x":0,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","echo"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Echo"}},{"type":"metric","x":6,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","foxtrot"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Foxtrot"}},{"type":"metric","x":12,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","golf"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Golf"}},{"type":"metric","x":18,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","hotel"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Hotel"}}]}
-Outputs:
-  SSMDocument:
-    Value: !Join
-      - ''
-      - - 'https://console.aws.amazon.com/systems-manager/documents/'
-        - !Ref SSMDocument
-        - /description?region=
-        - !Ref 'AWS::Region'
-  CustomerAlpha:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Alpha
-  CustomerBravo:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Bravo
-  CustomerCharlie:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Charlie
-  CustomerDelta:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Delta
-  CustomerEcho:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Echo
-  CustomerFoxtrot:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Foxtrot
-  CustomerGolf:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Golf
-  CustomerHotel:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Hotel
-  AvailabilityDashboard:
-    Value: !Join
-      - ''
-      - - https://console.aws.amazon.com/cloudwatch/home#dashboards:name=
-        - !Ref CanaryDashboard
diff --git a/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/shuffle-sharding.yaml b/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/shuffle-sharding.yaml
deleted file mode 100644
index 77fb840c2..000000000
--- a/static/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/Code/shuffle-sharding.yaml
+++ /dev/null
@@ -1,1296 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template to create lab resources. Creates an
-  Application Load Balancer, Target Groups, and EC2 instances in a new VPC.
-
-  **WARNING** You will be billed for the AWS resources created if you create a
-  stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License"). You may not
-  use this file except in compliance with the License. A copy of the License is
-  located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed  on
-  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-  or implied. See the License for the specific language governing permissions
-  and limitations under the License.
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-Resources:
-  VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      Tags:
-        - Key: Name
-          Value: WA-Lab-VPC
-  Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs ''
-      CidrBlock: 10.0.0.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet-1
-  Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs ''
-      CidrBlock: 10.0.1.0/24
-      VpcId: !Ref VPC
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: WA-Lab-Subnet-2
-  InternetGateway:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: WA-Lab-InternetGateway
-  VPCGatewayAttachment:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      InternetGatewayId: !Ref InternetGateway
-      VpcId: !Ref VPC
-  RouteTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref VPC
-      Tags:
-        - Key: Name
-          Value: WA-Lab-RouteTable
-  Route:
-    Type: 'AWS::EC2::Route'
-    DependsOn: VPCGatewayAttachment
-    Properties:
-      RouteTableId: !Ref RouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref InternetGateway
-  RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet1
-  RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref RouteTable
-      SubnetId: !Ref Subnet2
-  SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Inbound HTTP for WA Lab
-      VpcId: !Ref VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: '-1'
-          FromPort: '-1'
-          ToPort: '-1'
-          CidrIp: 0.0.0.0/0
-  Instance1:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-1
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance2:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-2
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance3:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-3
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance4:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-4
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance5:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-5
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance6:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet1
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-6
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance7:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-7
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  Instance8:
-    Type: 'AWS::EC2::Instance'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      InstanceType: t2.micro
-      IamInstanceProfile: !Ref InstanceProfile
-      SecurityGroupIds:
-        - !Ref SecurityGroup
-      SubnetId: !Ref Subnet2
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash -x
-            - |
-              yum update -y
-            - |
-              yum install python-pip -y
-            - |
-              pip install flask
-            - |
-              pip install boto3
-            - |
-              pip install ec2-metadata
-            - >
-              curl -o /home/ec2-user/buggy-webserver.py
-              https://aws-well-architected-labs-virginia.s3.amazonaws.com/Reliability/300_Fault_Isolation_with_Shuffle_Sharding/buggy-webserver.py
-            - >-
-              nohup python /home/ec2-user/buggy-webserver.py >>
-              /var/log/webserver.log 2>&1 &
-      Tags:
-        - Key: Name
-          Value: Worker-8
-        - Key: Workload
-          Value: WALab-shuffle-sharding
-  InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Roles:
-        - !Ref InstanceRole
-  InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ec2.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-      Policies:
-        - PolicyName: readtag
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'ec2:DescribeTags'
-                Resource: '*'
-  TargetGroup1:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance1
-          Port: '80'
-        - Id: !Ref Instance2
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup2:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance2
-          Port: '80'
-        - Id: !Ref Instance3
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup3:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance3
-          Port: '80'
-        - Id: !Ref Instance4
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup4:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance4
-          Port: '80'
-        - Id: !Ref Instance5
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup5:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance5
-          Port: '80'
-        - Id: !Ref Instance6
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup6:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance6
-          Port: '80'
-        - Id: !Ref Instance7
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup7:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance7
-          Port: '80'
-        - Id: !Ref Instance8
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  TargetGroup8:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    Properties:
-      HealthCheckIntervalSeconds: '5'
-      HealthCheckPath: /
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: '2'
-      HealthyThresholdCount: '2'
-      Port: '80'
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: '1'
-      Targets:
-        - Id: !Ref Instance8
-          Port: '80'
-        - Id: !Ref Instance1
-          Port: '80'
-      TargetType: instance
-      UnhealthyThresholdCount: '2'
-      VpcId: !Ref VPC
-  ALB:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    Properties:
-      SecurityGroups:
-        - !Ref SecurityGroup
-      Subnets:
-        - !Ref Subnet1
-        - !Ref Subnet2
-    DependsOn:
-      - VPCGatewayAttachment
-  ALBListener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    Properties:
-      DefaultActions:
-        - FixedResponseConfig:
-            MessageBody: Invalid Request. Please include customer name in the request.
-            StatusCode: '400'
-          Type: fixed-response
-      LoadBalancerArn: !Ref ALB
-      Port: '80'
-      Protocol: HTTP
-  ALBListenerRule1:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup1
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Alpha
-      ListenerArn: !Ref ALBListener
-      Priority: '1'
-  ALBListenerRule2:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup2
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Bravo
-      ListenerArn: !Ref ALBListener
-      Priority: '2'
-  ALBListenerRule3:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup3
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Charlie
-      ListenerArn: !Ref ALBListener
-      Priority: '3'
-  ALBListenerRule4:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup4
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Delta
-      ListenerArn: !Ref ALBListener
-      Priority: '4'
-  ALBListenerRule5:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup5
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Echo
-      ListenerArn: !Ref ALBListener
-      Priority: '5'
-  ALBListenerRule6:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup6
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Foxtrot
-      ListenerArn: !Ref ALBListener
-      Priority: '6'
-  ALBListenerRule7:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup7
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Golf
-      ListenerArn: !Ref ALBListener
-      Priority: '7'
-  ALBListenerRule8:
-    Type: 'AWS::ElasticLoadBalancingV2::ListenerRule'
-    Properties:
-      Actions:
-        - TargetGroupArn: !Ref TargetGroup8
-          Type: forward
-      Conditions:
-        - Field: query-string
-          QueryStringConfig:
-            Values:
-              - Key: name
-                Value: Hotel
-      ListenerArn: !Ref ALBListener
-      Priority: '8'
-  SSMDocument:
-    Type: 'AWS::SSM::Document'
-    Properties:
-      Content:
-        schemaVersion: '2.2'
-        description: State Manager Bootstrap Example
-        parameters: {}
-        mainSteps:
-          - action: 'aws:runShellScript'
-            name: configureServer
-            inputs:
-              runCommand:
-                - >-
-                  sudo nohup python /home/ec2-user/buggy-webserver.py >>
-                  /var/log/webserver.log 2>&1 &
-      DocumentType: Command
-  CanaryBucket:
-    Type: 'AWS::S3::Bucket'
-  CanaryRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Policies:
-        - PolicyName: SyntheticsCanary
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 's3:PutObject'
-                  - 's3:GetObject'
-                Resource:
-                  - !Join
-                    - ''
-                    - - 'arn:aws:s3:::'
-                      - !Ref CanaryBucket
-                      - /*
-              - Effect: Allow
-                Action:
-                  - 's3:GetBucketLocation'
-                Resource:
-                  - !GetAtt
-                    - CanaryBucket
-                    - Arn
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                  - 'logs:CreateLogGroup'
-                Resource:
-                  - '*'
-              - Effect: Allow
-                Action:
-                  - 's3:ListAllMyBuckets'
-                  - 'xray:PutTraceSegments'
-                Resource:
-                  - '*'
-              - Effect: Allow
-                Resource: '*'
-                Action: 'cloudwatch:PutMetricData'
-                Condition:
-                  StringEquals:
-                    'cloudwatch:namespace': CloudWatchSynthetics
-  AlphaCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: alpha
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Alpha";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  BravoCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: bravo
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Bravo";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  CharlieCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: charlie
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Charlie";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  DeltaCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: delta
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Delta";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  EchoCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: echo
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Echo";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  FoxtrotCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: foxtrot
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Foxtrot";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  GolfCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: golf
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Golf";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  HotelCanary:
-    Type: 'AWS::Synthetics::Canary'
-    Properties:
-      Name: hotel
-      ExecutionRoleArn: !GetAtt
-        - CanaryRole
-        - Arn
-      Code:
-        Handler: pageloadBlueprint.handler
-        Script: !Join
-          - ''
-          - - |-
-              var synthetics = require('Synthetics');
-              const log = require('SyntheticsLogger');
-
-              const pageLoadBlueprint = async function () {
-
-                  // INSERT URL here
-                  const URL = "http://
-            - !GetAtt
-              - ALB
-              - DNSName
-            - |
-              /?name=Hotel";
-
-                  let page = await synthetics.getPage();
-                  const response = await page.goto(URL, {waitUntil: 'domcontentloaded', timeout: 30000});
-                  //Wait for page to render.
-                  //Increase or decrease wait time based on endpoint being monitored.
-                  await page.waitFor(15000);
-                  await synthetics.takeScreenshot('loaded', 'loaded');
-                  let pageTitle = await page.title();
-                  log.info('Page title: ' + pageTitle);
-                  if (response.status() !== 200) {
-                      throw "Failed to load page!";
-                  }
-              };
-
-              exports.handler = async () => {
-                  return await pageLoadBlueprint();
-              };
-      ArtifactS3Location: !Sub 's3://${CanaryBucket}'
-      RuntimeVersion: syn-nodejs-puppeteer-3.8
-      Schedule:
-        Expression: rate(1 minute)
-      StartCanaryAfterCreation: true
-    DependsOn:
-      - TargetGroup1
-      - TargetGroup2
-      - TargetGroup3
-      - TargetGroup4
-      - TargetGroup5
-      - TargetGroup6
-      - TargetGroup7
-      - TargetGroup8
-  CanaryDashboard:
-    Type: 'AWS::CloudWatch::Dashboard'
-    Properties:
-      DashboardName: Customer-availability
-      DashboardBody: !Sub >-
-        {"widgets":[{"type":"metric","x":0,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","alpha"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Alpha"}},{"type":"metric","x":6,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","bravo"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Bravo"}},{"type":"metric","x":12,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","charlie"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Charlie"}},{"type":"metric","x":18,"y":0,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","delta"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Delta"}},{"type":"metric","x":0,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","echo"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Echo"}},{"type":"metric","x":6,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","foxtrot"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Foxtrot"}},{"type":"metric","x":12,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","golf"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Golf"}},{"type":"metric","x":18,"y":6,"width":6,"height":6,"properties":{"metrics":[["CloudWatchSynthetics","SuccessPercent","CanaryName","hotel"]],"view":"timeSeries","stacked":false,"region":"${AWS::Region}","period":60,"stat":"Sum","title":"Hotel"}}]}
-Outputs:
-  SSMDocument:
-    Value: !Join
-      - ''
-      - - 'https://console.aws.amazon.com/systems-manager/documents/'
-        - !Ref SSMDocument
-        - /description?region=
-        - !Ref 'AWS::Region'
-  CustomerAlpha:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Alpha
-  CustomerBravo:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Bravo
-  CustomerCharlie:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Charlie
-  CustomerDelta:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Delta
-  CustomerEcho:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Echo
-  CustomerFoxtrot:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Foxtrot
-  CustomerGolf:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Golf
-  CustomerHotel:
-    Value: !Join
-      - ''
-      - - !GetAtt
-          - ALB
-          - DNSName
-        - /?name=Hotel
-  AvailabilityDashboard:
-    Value: !Join
-      - ''
-      - - https://console.aws.amazon.com/cloudwatch/home#dashboards:name=
-        - !Ref CanaryDashboard
diff --git a/static/Reliability/Common/Code/CloudFormation/staticwebapp-active-passive.yaml b/static/Reliability/Common/Code/CloudFormation/staticwebapp-active-passive.yaml
deleted file mode 100644
index 8a76f67a9..000000000
--- a/static/Reliability/Common/Code/CloudFormation/staticwebapp-active-passive.yaml
+++ /dev/null
@@ -1,590 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a static web app. This template installs a highly-available, scalable web application deployment.
-  It demonstrates using the AWS CloudFormation bootstrap scripts to deploy a stateless web application.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-  
-########################################################################
-
-Parameters:
-  #General:
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: WebApp1
-  #Imports:
-  VPCImportName:
-    Type: String
-    Description: 'The CloudFormation name of the VPC stack to import'
-    Default: 'WebApp1-VPC'
-    MinLength: '3'
-    MaxLength: '32'
-  VPCImportApp1Instance1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 1'
-    Default: 'App1Subnet1'
-  VPCImportApp1Instance1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 2'
-    Default: 'App1Subnet2'
-  VPCImportApp1Instance1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 3'
-    Default: 'App1Subnet3'
-  VPCImportALB1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet1'
-  VPCImportALB1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet2'
-  VPCImportALB1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet3'
-  #Application Tier
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t3.medium
-      - t3.large
-      - t2.nano
-      - t2.micro
-      - t2.small
-      - t2.medium
-      - t2.large
-      - m5.medium
-      - m5.large
-      - m5.xlarge
-      - m5.2xlarge
-      - m5.4xlarge
-      - m5.12xlarge
-      - m5.24xlarge
-    ConstraintDescription: must be a valid EC2 instance type.
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  ServerCodeUrl:
-    Type: String
-    Default: 'https://aws-well-architected-labs-ohio.s3.us-east-2.amazonaws.com/Healthcheck/Code/server_basic.py'
-    AllowedPattern: '^(https?:\/\/)([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$'
-    ConstraintDescription: URL where server code can be downloaded, such as S3 or GitHub.
-  ALBSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-  Web1AutoScaleDesired:
-    Default: '3'
-    Description: The desired number of web instances in auto scaling group
-    Type: Number
-    MinValue: '3'
-    MaxValue: '6'
-    ConstraintDescription: must be between 3 and 6 EC2 instances.
-  Web1AutoScaleMax:
-    Default: '6'
-    Description: The desired number of web instances in auto scaling group
-    Type: Number
-    MinValue: '3'
-    MaxValue: '6'
-    ConstraintDescription: must be between 3 and 6 EC2 instances.    
-  ActiveOrPassive:
-    Default: 'active'
-    Description: Is this the active (primary) deployment or the passive (recovery) deployment
-    Type: String
-    AllowedValues:
-      - active
-      - passive
-    ConstraintDescription: enter active or passive, all lowercase
-########################################################################
-
-# Determine whether this is an active stack or passive stack
-Conditions:
-
-  IsActive: !Equals [!Ref "ActiveOrPassive", "active"]
-
-########################################################################
-
-Resources:
-
-  DynamoDBServiceMockTable:
-    Type: 'AWS::DynamoDB::Table'
-    Properties: 
-      TableName: 'RecommendationService'
-      AttributeDefinitions: 
-        - 
-          AttributeName: 'ServiceAPI'
-          AttributeType: 'S'
-        - 
-          AttributeName: 'UserID'
-          AttributeType: 'N'
-      KeySchema: 
-        - 
-          AttributeName: 'ServiceAPI'
-          KeyType: 'HASH'
-        - 
-          AttributeName: 'UserID'
-          KeyType: 'RANGE'
-      ProvisionedThroughput: 
-        ReadCapacityUnits: '5'
-        WriteCapacityUnits: '5'
-      SSESpecification: 
-        SSEEnabled: 'true'
-
-  ALB1SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref ALBSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref ALBSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Load Balancer
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-
-  ALB1LoadBalancer:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
-    Properties:
-      SecurityGroups:
-        - Ref: ALB1SecurityGroup
-      Subnets:
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet1}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet2}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet3}'
-
-  ALB1Listener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
-    Properties:
-      #  Certificates:
-        #- Certificate
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref ALB1TargetGroup
-      LoadBalancerArn: !Ref ALB1LoadBalancer
-      Port: '80'
-      Protocol: HTTP
-
-  ALB1TargetGroup:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
-    Properties:
-      HealthCheckPath: /healthcheck
-      HealthCheckIntervalSeconds: 15
-      #HealthCheckPort: 
-      #HealthCheckProtocol:
-      HealthCheckTimeoutSeconds: 3
-      HealthyThresholdCount: 2
-      Port: 80
-      Protocol: HTTP
-      # A short drain time helps speed up the lab
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 10
-      UnhealthyThresholdCount: 3
-      VpcId: 
-        Fn::ImportValue: !Sub '${VPCImportName}'
-
-  Web1InstanceSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 restricted to the load balancer
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Instance
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-
-  WebAppAutoScalingGroup:
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html
-    Type: 'AWS::AutoScaling::AutoScalingGroup'
-    Properties:
-      # To make it faster to update the server during the lab,
-      # we will be replacing the AutoScalingGroup. Therefore
-      # we must let CloudFormation name it
-      # AutoScalingGroupName: !Sub '${NamingPrefix}'
-      VPCZoneIdentifier:
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet1'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet2'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet3'
-      LaunchConfigurationName: !Ref Web1LaunchConfig
-      MinSize: !If [IsActive, !Ref Web1AutoScaleDesired, 0]
-      MaxSize: !Ref Web1AutoScaleMax
-      DesiredCapacity: !If [IsActive, !Ref Web1AutoScaleDesired, 0]
-      TargetGroupARNs:
-        - !Ref ALB1TargetGroup
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}'
-          PropagateAtLaunch: true
-    UpdatePolicy:
-      AutoScalingReplacingUpdate:
-        WillReplace: 'true'
-
-  Web1LaunchConfig:
-    Type: 'AWS::AutoScaling::LaunchConfiguration'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html
-    Properties:
-      ImageId: !Ref LatestAmiId
-      IamInstanceProfile: !Ref Web1InstanceInstanceProfile
-      InstanceType: !Ref InstanceType
-      SecurityGroups:
-        - !Ref Web1InstanceSecurityGroup
-      UserData:
-        Fn::Base64: !Sub |
-          #!/bin/bash
-          yum -y update
-          sleep 30 # prevent "Error: Rpmdb changed underneath us"
-          yum install python3 python-virtualenv python-pip -y
-          python3 -m venv /home/ec2-user/venv
-          source /home/ec2-user/venv/bin/activate
-          pip install boto3
-          pip install ec2_metadata
-          wget -O server.py ${ServerCodeUrl}
-          python3 server.py -p 80 -r ${AWS::Region}
-
-  WebInstancePolicy:
-    Type: AWS::IAM::ManagedPolicy
-    Properties:
-      Description: 'Policy used by EC2 WebServers'
-      ManagedPolicyName: !Sub '${NamingPrefix}-EC2-Policy-${AWS::StackName}'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - 'ec2:DescribeInstanceStatus'
-            Resource: '*'
-            # VPC Flow Logs: https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs-cwl.html
-          - Effect: Allow
-            Action: 
-              - 'logs:CreateLogGroup'
-              - 'logs:CreateLogStream'
-              - 'logs:PutLogEvents'
-              - 'logs:DescribeLogStreams'
-            Resource: 'arn:aws:logs:*:*:*'
-            # CloudWatch: Required to create metrics" https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/permissions-reference-cw.html
-          - Effect: Allow
-            Action:
-              - 'cloudwatch:PutMetricData'
-            Resource: '*'
-            # SSM: Our web app code on EC2 reads an SSM Parameter as part of this lab
-          - Effect: Allow
-            Action: 
-              - 'ssm:GetParameter'
-            Resource: '*'
-
-  # IAM Role for EC2 servers including access to DynamoDB (DDB)
-  Web1InstanceRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn: WebInstancePolicy
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-EC2-Role-${AWS::StackName}'
-      Path: /
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - !Ref WebInstancePolicy
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-      # In addition to the ManagedPolicy, give it access to DDB
-      Policies:
-        - PolicyName: ddbReadOnly
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'dynamodb:BatchGetItem'
-                  - 'dynamodb:Describe*'
-                  - 'dynamodb:List*'
-                  - 'dynamodb:GetItem'
-                  - 'dynamodb:Query'
-                  - 'dynamodb:Scan'
-                Resource: 'arn:aws:dynamodb:*:*:table/*'
-
-  # IAM Role for EC2 servers WITHOUT access to DynamoDB (DDB)
-  Web2InstanceRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn: WebInstancePolicy
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-EC2-noDDB-Role-${AWS::StackName}'
-      Path: /
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - !Ref WebInstancePolicy
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-
-  Web1InstanceInstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      InstanceProfileName: !Sub '${NamingPrefix}-EC2-Role-${AWS::StackName}'
-      Path: /Web1InstanceEc2Role/
-      Roles:
-        - !Ref Web1InstanceRole
-
-  Web2InstanceInstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      InstanceProfileName: !Sub '${NamingPrefix}-EC2-noDDB-Role-${AWS::StackName}'
-      Path: /Web2InstanceEc2Role/
-      Roles:
-        - !Ref Web2InstanceRole
-
-  LoadDynamoDBLambdaRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-Lambda-${AWS::StackName}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: ddbFull
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'dynamodb:BatchWriteItem'
-                Resource: 'arn:aws:dynamodb:*:*:table/RecommendationService'
-        - PolicyName: cloudwatch
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                  - 'logs:DescribeLogStreams'
-                Resource: 'arn:aws:logs:*:*:*'
-              - Effect: Allow
-                Action:
-                  - 'cloudwatch:PutMetricData'
-                Resource: '*'
-
-  LoadDynamoDBLambda:
-      Type: 'AWS::Lambda::Function'
-      Properties:
-        FunctionName: 'LoadDynamoDBLambda'
-        Handler: 'index.handler'
-        Runtime: 'python3.9'
-        Timeout: '30'
-        Role: !GetAtt LoadDynamoDBLambdaRole.Arn
-        Code:
-          ZipFile: !Sub |
-            import boto3
-            import urllib.request
-            import cfnresponse
-            import logging
-            import signal
-            import json
-            import traceback
-
-            LOGGER = logging.getLogger()
-            LOGGER.setLevel(logging.INFO)
-
-            def populate_ddb_table():
-                # Get the service resource.
-                LOGGER.info('create client')
-                client = boto3.client('dynamodb', '${AWS::Region}')
-                
-                # @TODO, make bucket/object configurable
-                LOGGER.info('open file')
-                file = urllib.request.urlopen("https://aws-well-architected-labs-ohio.s3.us-east-2.amazonaws.com/Healthcheck/Data/RecommendationService.json")
-                LOGGER.info('read file')
-                text = file.read()
-                LOGGER.info(text)
-                LOGGER.info('convert to JSON')
-                request_items = json.loads(text)
-                LOGGER.info('write to DDB')
-                response = client.batch_write_item(RequestItems=request_items)
-                LOGGER.info('DONE')
-                
-                # @TODO add error handling 
-                
-                # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb.html#DynamoDB.Client.batch_write_item
-
-
-            def handler(event, context):
-                signal.alarm(int((context.get_remaining_time_in_millis() / 1000) - 1))
-                # Setup alarm for remaining runtime minus a second
-                try:
-                    LOGGER.info('EVENT RECEIVED: %s', event)
-                    LOGGER.info('CONTEXT RECEIVED: %s', context)
-                    if event['RequestType'] == 'Create':
-                        LOGGER.info('CREATE')
-                        populate_ddb_table()
-                        cfnresponse.send(event, context, cfnresponse.SUCCESS,
-                            {'Message': 'Resource creation successful!'})
-                    elif event['RequestType'] == 'Update':
-                        LOGGER.info('UPDATE')
-                        populate_ddb_table()
-                        cfnresponse.send(event, context, cfnresponse.SUCCESS,
-                            {'Message': 'Resource update successful!'})
-                    elif event['RequestType'] == 'Delete':
-                        LOGGER.info('DELETE')
-                        # do nothing, table will be deleted anyway
-                        cfnresponse.send(event, context, cfnresponse.SUCCESS,
-                            {'Message': 'Resource deletion successful!'})
-                    else:
-                        LOGGER.info('FAILED!')
-                        cfnresponse.send(event, context, cfnresponse.FAILED,
-                            {'Message': 'Unexpected event received from CloudFormation'})
-                except Exception as e:
-                    LOGGER.info(str(traceback.format_exception_only(e.__class__, e)))
-                    LOGGER.info('FAILED!')
-                    cfnresponse.send(event, context, cfnresponse.FAILED, {
-                        'Message': 'Exception during processing'})
-
-            def timeout_handler(_signal, _frame):
-                raise Exception('Time exceeded')
-
-            signal.signal(signal.SIGALRM, timeout_handler)
-
-  CustomResource:
-    Type: 'Custom::LoadDynamoDB'
-    DependsOn: DynamoDBServiceMockTable
-    Properties:
-      ServiceToken: !GetAtt LoadDynamoDBLambda.Arn
-      DynamoTableName: !Ref DynamoDBServiceMockTable
-
-  RecommendationServiceEnabled:
-    Type: AWS::SSM::Parameter
-    Properties: 
-      AllowedPattern: '^(true|false)$'
-      Description: 'switch used to enable/disable the mocked RecommendationService'
-      Name: 'RecommendationServiceEnabled'
-      Tier: 'Standard'
-      Type: 'String'
-      Value: 'true'
-
-########################################################################
-
-Outputs:
-  WebsiteURL:
-    Value: !Join
-      - ''
-      - - 'http://'
-        - !GetAtt 
-          - ALB1LoadBalancer
-          - DNSName
-        - /
-    Description: Static Website
-    
-########################################################################
-
-Metadata: 
-  AWS::CloudFormation::Interface: 
-    ParameterGroups: 
-      - 
-        Label: 
-          default: "General Configuration"
-        Parameters: 
-          - NamingPrefix
-      -
-        Label:
-          default: "Application Tier Capacity"   
-        Parameters:
-          - Web1AutoScaleDesired
-          - Web1AutoScaleMax
-          - ActiveOrPassive
-      - 
-        Label: 
-          default: "VPC Stack Imports"
-        Parameters: 
-          - VPCImportName
-          - VPCImportApp1Instance1Subnet1
-          - VPCImportApp1Instance1Subnet2
-          - VPCImportApp1Instance1Subnet3
-          - VPCImportALB1Subnet1
-          - VPCImportALB1Subnet2
-          - VPCImportALB1Subnet3
-      - 
-        Label: 
-          default: "Application Tier Configuration"
-        Parameters: 
-          - InstanceType
-          - LatestAmiId
-          - ServerCodeUrl
-          - ALBSGSource
-
diff --git a/static/Reliability/Common/Code/CloudFormation/staticwebapp.yaml b/static/Reliability/Common/Code/CloudFormation/staticwebapp.yaml
deleted file mode 100644
index 447c73552..000000000
--- a/static/Reliability/Common/Code/CloudFormation/staticwebapp.yaml
+++ /dev/null
@@ -1,569 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a static web app. This template installs a highly-available, scalable web application deployment.
-  It demonstrates using the AWS CloudFormation bootstrap scripts to deploy a stateless web application.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-  
-########################################################################
-
-Parameters:
-  #General:
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: WebApp1
-  #Imports:
-  VPCImportName:
-    Type: String
-    Description: 'The CloudFormation name of the VPC stack to import'
-    Default: 'WebApp1-VPC'
-    MinLength: '3'
-    MaxLength: '32'
-  VPCImportApp1Instance1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 1'
-    Default: 'App1Subnet1'
-  VPCImportApp1Instance1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 2'
-    Default: 'App1Subnet2'
-  VPCImportApp1Instance1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 3'
-    Default: 'App1Subnet3'
-  VPCImportALB1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet1'
-  VPCImportALB1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet2'
-  VPCImportALB1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet3'
-  #Application Tier
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t3.medium
-      - t3.large
-      - t2.nano
-      - t2.micro
-      - t2.small
-      - t2.medium
-      - t2.large
-      - m5.medium
-      - m5.large
-      - m5.xlarge
-      - m5.2xlarge
-      - m5.4xlarge
-      - m5.12xlarge
-      - m5.24xlarge
-    ConstraintDescription: must be a valid EC2 instance type.
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  ServerCodeUrl:
-    Type: String
-    Default: 'https://aws-well-architected-labs-ohio.s3.us-east-2.amazonaws.com/Healthcheck/Code/server_basic.py'
-    AllowedPattern: '^(https?:\/\/)([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$'
-    ConstraintDescription: URL where server code can be downloaded, such as S3 or GitHub.
-  ALBSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-  Web1AutoScaleDesired:
-    Default: '3'
-    Description: The desired number of web instances in auto scaling group
-    Type: Number
-    MinValue: '3'
-    MaxValue: '6'
-    ConstraintDescription: must be between 3 and 6 EC2 instances. 
-    
-########################################################################
-
-# "Conditions" would go here, but this CloudFormation Template does not 
-# make use of them
-
-
-########################################################################
-
-Resources:
-
-  DynamoDBServiceMockTable:
-    Type: 'AWS::DynamoDB::Table'
-    Properties: 
-      TableName: 'RecommendationService'
-      AttributeDefinitions: 
-        - 
-          AttributeName: 'ServiceAPI'
-          AttributeType: 'S'
-        - 
-          AttributeName: 'UserID'
-          AttributeType: 'N'
-      KeySchema: 
-        - 
-          AttributeName: 'ServiceAPI'
-          KeyType: 'HASH'
-        - 
-          AttributeName: 'UserID'
-          KeyType: 'RANGE'
-      ProvisionedThroughput: 
-        ReadCapacityUnits: '5'
-        WriteCapacityUnits: '5'
-      SSESpecification: 
-        SSEEnabled: 'true'
-
-  ALB1SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref ALBSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref ALBSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Load Balancer
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-
-  ALB1LoadBalancer:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
-    Properties:
-      SecurityGroups:
-        - Ref: ALB1SecurityGroup
-      Subnets:
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet1}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet2}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet3}'
-
-  ALB1Listener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
-    Properties:
-      #  Certificates:
-        #- Certificate
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref ALB1TargetGroup
-      LoadBalancerArn: !Ref ALB1LoadBalancer
-      Port: '80'
-      Protocol: HTTP
-
-  ALB1TargetGroup:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
-    Properties:
-      HealthCheckPath: /healthcheck
-      HealthCheckIntervalSeconds: 15
-      #HealthCheckPort: 
-      #HealthCheckProtocol:
-      HealthCheckTimeoutSeconds: 3
-      HealthyThresholdCount: 2
-      Port: 80
-      Protocol: HTTP
-      # A short drain time helps speed up the lab
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 10
-      UnhealthyThresholdCount: 3
-      VpcId: 
-        Fn::ImportValue: !Sub '${VPCImportName}'
-
-  Web1InstanceSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 restricted to the load balancer
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Instance
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-
-  WebAppAutoScalingGroup:
-    Type: 'AWS::AutoScaling::AutoScalingGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html
-    Properties:
-      # To make it faster to update the server during the lab,
-      # we will be replacing the AutoScalingGroup. Therefore
-      # we must let CloudFormation name it
-      # AutoScalingGroupName: !Sub '${NamingPrefix}'
-      VPCZoneIdentifier:
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet1'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet2'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet3'
-      LaunchConfigurationName: !Ref Web1LaunchConfig
-      MinSize: '3'
-      MaxSize: !Ref Web1AutoScaleDesired
-      DesiredCapacity: !Ref Web1AutoScaleDesired
-      TargetGroupARNs:
-        - !Ref ALB1TargetGroup
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}'
-          PropagateAtLaunch: true
-    UpdatePolicy:
-      AutoScalingReplacingUpdate:
-        WillReplace: 'true'
-
-  Web1LaunchConfig:
-    Type: 'AWS::AutoScaling::LaunchConfiguration'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html
-    Properties:
-      ImageId: !Ref LatestAmiId
-      IamInstanceProfile: !Ref Web1InstanceInstanceProfile
-      InstanceType: !Ref InstanceType
-      SecurityGroups:
-        - !Ref Web1InstanceSecurityGroup
-      UserData:
-        Fn::Base64: !Sub |
-          #!/bin/bash
-          yum -y update
-          sleep 30 # prevent "Error: Rpmdb changed underneath us"
-          yum install python3 python-virtualenv python-pip -y
-          python3 -m venv /home/ec2-user/venv
-          source /home/ec2-user/venv/bin/activate
-          pip install boto3
-          pip install ec2_metadata
-          wget -O server.py ${ServerCodeUrl}
-          python3 server.py -p 80 -r ${AWS::Region}
-
-  WebInstancePolicy:
-    Type: AWS::IAM::ManagedPolicy
-    Properties:
-      Description: 'Policy used by EC2 WebServers'
-      ManagedPolicyName: !Sub '${NamingPrefix}-EC2-Policy-${AWS::StackName}'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - 'ec2:DescribeInstanceStatus'
-            Resource: '*'
-            # VPC Flow Logs: https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs-cwl.html
-          - Effect: Allow
-            Action: 
-              - 'logs:CreateLogGroup'
-              - 'logs:CreateLogStream'
-              - 'logs:PutLogEvents'
-              - 'logs:DescribeLogStreams'
-            Resource: 'arn:aws:logs:*:*:*'
-            # CloudWatch: Required to create metrics" https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/permissions-reference-cw.html
-          - Effect: Allow
-            Action:
-              - 'cloudwatch:PutMetricData'
-            Resource: '*'
-            # SSM: Our web app code on EC2 reads an SSM Parameter as part of this lab
-          - Effect: Allow
-            Action: 
-              - 'ssm:GetParameter'
-            Resource: '*'
-
-  # IAM Role for EC2 servers including access to DynamoDB (DDB)
-  Web1InstanceRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn: WebInstancePolicy
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-EC2-Role-${AWS::StackName}'
-      Path: /
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - !Ref WebInstancePolicy
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-      # In addition to the ManagedPolicy, give it access to DDB
-      Policies:
-        - PolicyName: ddbReadOnly
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'dynamodb:BatchGetItem'
-                  - 'dynamodb:Describe*'
-                  - 'dynamodb:List*'
-                  - 'dynamodb:GetItem'
-                  - 'dynamodb:Query'
-                  - 'dynamodb:Scan'
-                Resource: 'arn:aws:dynamodb:*:*:table/*'
-
-  # IAM Role for EC2 servers WITHOUT access to DynamoDB (DDB)
-  Web2InstanceRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn: WebInstancePolicy
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-EC2-noDDB-Role-${AWS::StackName}'
-      Path: /
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - !Ref WebInstancePolicy
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-
-  Web1InstanceInstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      InstanceProfileName: !Sub '${NamingPrefix}-EC2-Role-${AWS::StackName}'
-      Path: /Web1InstanceEc2Role/
-      Roles:
-        - !Ref Web1InstanceRole
-
-  Web2InstanceInstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      InstanceProfileName: !Sub '${NamingPrefix}-EC2-noDDB-Role-${AWS::StackName}'
-      Path: /Web2InstanceEc2Role/
-      Roles:
-        - !Ref Web2InstanceRole
-
-  LoadDynamoDBLambdaRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-Lambda-${AWS::StackName}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: ddbFull
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'dynamodb:BatchWriteItem'
-                Resource: 'arn:aws:dynamodb:*:*:table/RecommendationService'
-        - PolicyName: cloudwatch
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                  - 'logs:DescribeLogStreams'
-                Resource: 'arn:aws:logs:*:*:*'
-              - Effect: Allow
-                Action:
-                  - 'cloudwatch:PutMetricData'
-                Resource: '*'
-
-  LoadDynamoDBLambda:
-      Type: 'AWS::Lambda::Function'
-      Properties:
-        FunctionName: 'LoadDynamoDBLambda'
-        Handler: 'index.handler'
-        Runtime: 'python3.9'
-        Timeout: '30'
-        Role: !GetAtt LoadDynamoDBLambdaRole.Arn
-        Code:
-          ZipFile: !Sub |
-            import boto3
-            import urllib.request
-            import cfnresponse
-            import logging
-            import signal
-            import json
-            import traceback
-
-            LOGGER = logging.getLogger()
-            LOGGER.setLevel(logging.INFO)
-
-            def populate_ddb_table():
-                # Get the service resource.
-                LOGGER.info('create client')
-                client = boto3.client('dynamodb', '${AWS::Region}')
-                
-                # @TODO, make bucket/object configurable
-                LOGGER.info('open file')
-                file = urllib.request.urlopen("https://aws-well-architected-labs-ohio.s3.us-east-2.amazonaws.com/Healthcheck/Data/RecommendationService.json")
-                LOGGER.info('read file')
-                text = file.read()
-                LOGGER.info(text)
-                LOGGER.info('convert to JSON')
-                request_items = json.loads(text)
-                LOGGER.info('write to DDB')
-                response = client.batch_write_item(RequestItems=request_items)
-                LOGGER.info('DONE')
-                
-                # @TODO add error handling 
-                
-                # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb.html#DynamoDB.Client.batch_write_item
-
-
-            def handler(event, context):
-                signal.alarm(int((context.get_remaining_time_in_millis() / 1000) - 1))
-                # Setup alarm for remaining runtime minus a second
-                try:
-                    LOGGER.info('EVENT RECEIVED: %s', event)
-                    LOGGER.info('CONTEXT RECEIVED: %s', context)
-                    if event['RequestType'] == 'Create':
-                        LOGGER.info('CREATE')
-                        populate_ddb_table()
-                        cfnresponse.send(event, context, cfnresponse.SUCCESS,
-                            {'Message': 'Resource creation successful!'})
-                    elif event['RequestType'] == 'Update':
-                        LOGGER.info('UPDATE')
-                        populate_ddb_table()
-                        cfnresponse.send(event, context, cfnresponse.SUCCESS,
-                            {'Message': 'Resource update successful!'})
-                    elif event['RequestType'] == 'Delete':
-                        LOGGER.info('DELETE')
-                        # do nothing, table will be deleted anyway
-                        cfnresponse.send(event, context, cfnresponse.SUCCESS,
-                            {'Message': 'Resource deletion successful!'})
-                    else:
-                        LOGGER.info('FAILED!')
-                        cfnresponse.send(event, context, cfnresponse.FAILED,
-                            {'Message': 'Unexpected event received from CloudFormation'})
-                except Exception as e:
-                    LOGGER.info(str(traceback.format_exception_only(e.__class__, e)))
-                    LOGGER.info('FAILED!')
-                    cfnresponse.send(event, context, cfnresponse.FAILED, {
-                        'Message': 'Exception during processing'})
-
-            def timeout_handler(_signal, _frame):
-                raise Exception('Time exceeded')
-
-            signal.signal(signal.SIGALRM, timeout_handler)
-
-  CustomResource:
-    Type: 'Custom::LoadDynamoDB'
-    DependsOn: DynamoDBServiceMockTable
-    Properties:
-      ServiceToken: !GetAtt LoadDynamoDBLambda.Arn
-      DynamoTableName: !Ref DynamoDBServiceMockTable
-
-  RecommendationServiceEnabled:
-    Type: AWS::SSM::Parameter
-    Properties: 
-      AllowedPattern: '^(true|false)$'
-      Description: 'switch used to enable/disable the mocked RecommendationService'
-      Name: 'RecommendationServiceEnabled'
-      Tier: 'Standard'
-      Type: 'String'
-      Value: 'true'
-
-########################################################################
-
-Outputs:
-  WebsiteURL:
-    Value: !Join
-      - ''
-      - - 'http://'
-        - !GetAtt 
-          - ALB1LoadBalancer
-          - DNSName
-        - /
-    Description: Static Website
-    
-########################################################################
-
-Metadata: 
-  AWS::CloudFormation::Interface: 
-    ParameterGroups: 
-      - 
-        Label: 
-          default: "General Configuration"
-        Parameters: 
-          - NamingPrefix
-      - 
-        Label: 
-          default: "VPC Stack Imports"
-        Parameters: 
-          - VPCImportName
-          - VPCImportApp1Instance1Subnet1
-          - VPCImportApp1Instance1Subnet2
-          - VPCImportApp1Instance1Subnet3
-          - VPCImportALB1Subnet1
-          - VPCImportALB1Subnet2
-          - VPCImportALB1Subnet3
-      - 
-        Label: 
-          default: "Application Tier Configuration"
-        Parameters: 
-          - InstanceType
-          - LatestAmiId
-          - ServerCodeUrl
-          - Web1AutoScaleDesired
-          - ALBSGSource
-
diff --git a/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml b/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml
deleted file mode 100644
index 5c0d2a11d..000000000
--- a/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml
+++ /dev/null
@@ -1,641 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: 'This deployment includes SSM, CloudWatch, and allows instance reboot'
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-    Description: 'Use an AMI of your choosing, we recommend to use the latest available'
-Resources:
-  UniShopAppV1VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      EnableDnsSupport: 'true'
-      EnableDnsHostnames: 'true'
-      InstanceTenancy: default
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UniShopAppV1IGW:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  AttachGateway:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      InternetGatewayId: !Ref UniShopAppV1IGW
-  UniShopAppV1Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.0.0/24
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-1'
-  UniShopAppV1Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.1.0/24
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-2'
-  UniShopAppV1PublicRoutTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UniShopAppV1PublicRout:
-    Type: 'AWS::EC2::Route'
-    DependsOn: AttachGateway
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      GatewayId: !Ref UniShopAppV1IGW
-      DestinationCidrBlock: 0.0.0.0/0
-  UniShopAppV1PublicSubnetRoutTableAssoc1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet1
-  UniShopAppV1PublicSubnetRoutTableAssoc2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet2
-  DBSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open database for access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref EC2SecurityGroup
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  DBSubnetGroup:
-    Type: 'AWS::RDS::DBSubnetGroup'
-    Properties:
-      DBSubnetGroupDescription: UniShopAppV1DBSubnetGroup
-      SubnetIds:
-        - !Ref UniShopAppV1Subnet1
-        - !Ref UniShopAppV1Subnet2
-  EC2SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open App access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  EC2SecurityGroupDBRule:
-    Type: 'AWS::EC2::SecurityGroupEgress'
-    Properties:
-      GroupId: !Ref EC2SecurityGroup
-      IpProtocol: tcp
-      FromPort: 3306
-      ToPort: 3306
-      DestinationSecurityGroupId: !Ref DBSecurityGroup
-  InstanceLogGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: 7
-  S3InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref S3Role
-  S3Policy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: S3Policy
-      PolicyDocument:
-        Statement:
-          - Sid: AllowForOther
-            Effect: Allow
-            Action:
-              - 's3:GetBucketLocation'
-              - 's3:GetObject'
-              - 's3:PutObject'      
-              - 's3:GetBucketPolicy'
-              - 's3:PutBucketPolicy'  
-            Resource:
-              - !GetAtt
-                - UIBucket
-                - Arn
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - /*
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - -secondary
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - -secondary/*   
-          - Sid: AllowForListBucket
-            Effect: Allow
-            Action:
-              - 's3:ListAllMyBuckets'
-              - 's3:ListBucket'
-              - 's3:CreateBucket'
-              - 's3:Put*'
-            Resource:
-              - 'arn:aws:s3:::*'                               
-      Roles:
-        - !Ref S3Role
-  S3ReplicationPolicy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: S3ReplicationPolicy
-      PolicyDocument:
-        Statement:                             
-          - Sid: AllowForSourceObjects
-            Effect: Allow
-            Action:
-              - 's3:GetObjectVersionForReplication'
-              - 's3:GetObjectVersionTagging'              
-            Resource:
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - /*  
-          - Sid: AllowForSource
-            Effect: Allow
-            Action:
-              - 's3:ListBucket'
-              - 's3:GetReplicationConfiguration'        
-            Resource:
-              - !GetAtt
-                - UIBucket
-                - Arn
-          - Sid: AllowForDestinationObjects
-            Effect: Allow
-            Action:
-              - 's3:ReplicateObject'
-              - 's3:ReplicateDelete'
-              - 's3:ReplicateTags'              
-            Resource:
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - -secondary/*                                                                                     
-      Roles:
-        - !Ref S3Role
-  RDSPolicy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: RDSPolicy
-      PolicyDocument:
-        Statement:                                                                                     
-          - Sid: AllowForRDS
-            Effect: Allow
-            Action:
-              - 'rds:Describe*'
-            Resource:
-              - '*'                                
-      Roles:
-        - !Ref S3Role
-  S3Role:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${AWS::StackName}-${AWS::Region}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-          - Effect: Allow
-            Principal:
-              Service:
-                - s3.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'              
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-        - 'arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy'
-      Path: /
-  DBInstance:
-    Type: 'AWS::RDS::DBInstance'
-    DeletionPolicy: Delete
-    Properties:
-      DBName: unishop
-      DBInstanceIdentifier: !Ref 'AWS::StackName'
-      Engine: MySQL
-      DBInstanceClass: db.t3.micro
-      Port: '3306'
-      MasterUsername: UniShopAppV1User
-      MasterUserPassword: UniShopAppV1Password
-      VPCSecurityGroups:
-        - !Ref DBSecurityGroup
-      AllocatedStorage: '5'
-      DBSubnetGroupName: !Ref DBSubnetGroup
-      MultiAZ: 'false'
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UIBucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      WebsiteConfiguration:
-        ErrorDocument: error.html
-        IndexDocument: index.html
-      VersioningConfiguration:
-        Status: Enabled       
-      PublicAccessBlockConfiguration:
-        BlockPublicAcls: false
-        BlockPublicPolicy: false
-        IgnorePublicAcls: false
-        RestrictPublicBuckets: false         
-  UIBucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref UIBucket
-      PolicyDocument:
-        Statement:
-          -
-            Action:
-              - s3:GetObject
-            Effect: Allow
-            Resource:
-              Fn::Join:
-                - ''
-                - - 'arn:aws:s3:::'
-                  - Ref: 'UIBucket'
-                  - '/*'
-            Principal:
-              AWS:
-                - '*'        
-  EC2Instance:
-    Type: 'AWS::EC2::Instance'
-    DependsOn: DBInstance
-    CreationPolicy:
-      ResourceSignal:
-        Count: 1
-        Timeout: PT30M
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          default:
-            - update
-            - install
-            - configure
-            - create-tables            
-            - create-service-files
-            - start-service
-        update:
-          commands:
-            update:
-              command: sudo yum update -y
-        install:
-          packages:
-            rpm:
-              'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-            yum:
-              amazon-cloudwatch-agent: []
-              java-1.8.0-openjdk-devel: []
-              mariadb: []
-        configure:
-          commands:
-            0-populate-buckets:
-              command: !Join
-                - ''
-                - - |
-                    #!/bin/bash      
-
-                  - |
-                    sudo mkdir /home/ec2-user/UniShopUI/                              
-                
-                  - export AWS_DEFAULT_REGION=
-                  - !Ref 'AWS::Region'
-                  - |+
-
-                  - export UI_RANDOM_NAME=
-                  - !Ref UIBucket
-                  - |+       
-
-                  - export SECONDARY_BUCKET=
-                  - $(echo "$UI_RANDOM_NAME" | sed 's/primary/secondary/')                                  
-                  - |+
-
-                  - export HOSTNAME=
-                  - "http://"
-                  - $(curl -s http://169.254.169.254/latest/meta-data/public-hostname)
-                  - |+
-
-                  - export JSON_STRING=
-                  - $(echo '{"host":"'"$HOSTNAME"'","region":"'"$AWS_DEFAULT_REGION"'"}')
-                  - |+ 
-
-                  - >
-                    echo $JSON_STRING | sudo tee /home/ec2-user/UniShopUI/config.json    
-
-                  - >
-                    aws s3api create-bucket --bucket $SECONDARY_BUCKET --create-bucket-configuration LocationConstraint=us-west-1 --region us-west-1
-
-                  - >
-                    aws s3api put-bucket-versioning --bucket $SECONDARY_BUCKET --versioning-configuration Status=Enabled                                            
-
-                  - >
-                    aws s3api put-public-access-block --bucket $SECONDARY_BUCKET --public-access-block-configuration "BlockPublicAcls=false,IgnorePublicAcls=false,BlockPublicPolicy=false,RestrictPublicBuckets=false"                    
-
-                  - >
-                    aws s3api get-bucket-policy --bucket $UI_RANDOM_NAME --query Policy --output text > policy.json
-
-                  - >
-                    sed -i 's/primary/secondary/g' policy.json
-                    
-                  - >
-                    aws s3api put-bucket-policy --bucket $SECONDARY_BUCKET --policy file://policy.json                            
-
-                  - >
-                    aws s3 website s3://$SECONDARY_BUCKET/ --index-document index.html --error-document error.html                  
-
-                  - >
-                    aws s3 cp /home/ec2-user/UniShopUI/
-                    s3://$UI_RANDOM_NAME/ --recursive        
-                    
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopAppV1-0.0.1-SNAPSHOT.jar /home/ec2-user/ --no-sign-request  
-
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/create_tables.sql /home/ec2-user/ --no-sign-request    
-
-        create-tables:
-          commands:
-            1-create-tables:
-              command: !Join
-                - ''
-                - - 'sudo mysql -u UniShopAppV1User -h '
-                  - !GetAtt
-                    - DBInstance
-                    - Endpoint.Address
-                  - |2
-                     -P 3306 -pUniShopAppV1Password < /home/ec2-user/create_tables.sql
-        create-service-files:
-          files:
-            /etc/systemd/system/unishop.service:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    [Unit]
-                  - |
-                    Description=Restart UniShop
-                  - |
-                    Wants=network.target
-                  - >
-                    After=syslog.target network-online.target
-                    amazon-cloudwatch-agent.target
-                  - |+
-
-                  - |
-                    [Service]
-                  - |
-                    Type=forking
-                  - |
-                    ExecStart=/home/ec2-user/unishopstart.sh
-                  - |
-                    ExecReload=/home/ec2-user/unishoprestart.sh
-                  - |
-                    ExecStop=/home/ec2-user/unishopstop.sh
-                  - |                                    
-                    PrivateTmp=true
-                  - |+
-
-                  - |
-                    [Install]
-                  - |
-                    WantedBy=multi-user.target
-              mode: '000644'
-              group: root
-              user: root
-            /home/ec2-user/unishopcfg.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - export DB_ENDPOINT=
-                  - !GetAtt
-                    - DBInstance
-                    - Endpoint.Address
-                  - |+               
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user
-            /home/ec2-user/unishoprestart.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |          
-                      source /home/ec2-user/unishopstop.sh      
-                  - |
-                    source /home/ec2-user/unishopstart.sh                
-                  - |+
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user
-            /home/ec2-user/unishopstop.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |
-                    APP_NAME=UniShopAppV1-0.0.1-SNAPSHOT.jar                                                                     
-                  - | 
-                    pid=`ps -ef | grep $APP_NAME | grep -v grep | awk '{print $2}'`
-                  - |
-                    if [ -z "${pid}" ]; 
-                  - |
-                    then echo ""
-                  - |
-                    else
-                  - |
-                    echo "kill thread...$pid"
-                  - |
-                    kill -9 $pid                  
-                  - |
-                    fi
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user              
-            /home/ec2-user/unishopstart.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |                    
-                    export AWS_DEFAULT_REGION=$(curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | python -c "import json,sys; print json.loads(sys.stdin.read())['region']")
-                  - |
-                    export UI_RANDOM_NAME=$(aws s3api list-buckets --region $AWS_DEFAULT_REGION --output text --query 'Buckets[?starts_with(Name, `backupandrestore-secondary-`) == `true`]'.Name)
-                  - |
-                    export HOSTNAME="http://$(curl -s http://169.254.169.254/latest/meta-data/public-hostname)"
-                  - |
-                    echo '{"host":"'"$HOSTNAME"'","region":"'"$AWS_DEFAULT_REGION"'"}' | sudo tee /home/ec2-user/UniShopUI/config.json                    
-                  - |
-                    sudo aws s3 cp /home/ec2-user/UniShopUI/config.json s3://$UI_RANDOM_NAME/config.json   
-                  - |   
-                    source /home/ec2-user/unishopcfg.sh  
-                  - |                                                      
-                  - java -jar /home/ec2-user/UniShopAppV1-0.0.1-SNAPSHOT.jar &> /home/ec2-user/app.log &
-                  - |+
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user              
-            /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json:
-              content: !Join
-                - ''
-                - - |
-                    {
-                  - |2
-                        "logs": {
-                  - |2
-                            "logs_collected": {
-                  - |2
-                                "files": {
-                  - |2
-                                    "collect_list": [
-                  - |2
-                                        {
-                  - |2
-                                            "file_path": "/home/ec2-user/app.log",
-                  - !Join
-                    - ''
-                    - - '                        "log_group_name":'
-                      - '"'
-                      - !Ref InstanceLogGroup
-                      - |
-                        ",
-                  - !Join
-                    - ''
-                    - - '                        "log_stream_name":'
-                      - '"'
-                      - !Ref InstanceLogGroup
-                      - |
-                        -app",
-                  - |2
-                                            "timezone": "Local"
-                  - |2
-                                        }
-                  - |2
-                                    ]
-                  - |2
-                                }
-                  - |2
-                            }
-                  - |2
-                        }
-                  - '}'
-              mode: '000444'
-              group: ec2-user
-              user: ec2-user
-        start-service:
-          commands:
-            0-start-service:
-              command: !Join
-                - ''
-                - - |
-                    sudo systemctl daemon-reload
-                  - |
-                    sudo systemctl enable unishop
-                  - |
-                    sudo systemctl start unishop
-                  - >
-                    sudo amazon-cloudwatch-agent-ctl -a fetch-config -s -m ec2
-                    -c
-                    file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
-    Properties:
-      InstanceType: t3.small
-      ImageId: !Ref LatestAmiId
-      SubnetId: !Ref UniShopAppV1Subnet1
-      SecurityGroupIds:
-        - !Ref EC2SecurityGroup
-      IamInstanceProfile: !Ref S3InstanceProfile
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash
-            - |
-              sudo yum install -y aws-cfn-bootstrap
-            - /opt/aws/bin/cfn-init -v
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource EC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - '         --configsets default'
-            - |+
-
-            - /opt/aws/bin/cfn-signal -e $?
-            - ' --stack '
-            - !Ref 'AWS::StackName'
-            - ' --resource EC2Instance'
-            - ' --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-Outputs:
-  WebsiteURL:
-    Value: !GetAtt UIBucket.WebsiteURL
-    Description: Website URL
diff --git a/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml b/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml
deleted file mode 100644
index b68d7a671..000000000
--- a/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml
+++ /dev/null
@@ -1,180 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: 'This deployment includes SSM, CloudWatch, and allows instance reboot'
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-    Description: 'Use an AMI of your choosing, we recommend to use the latest available'
-Resources:
-  DBSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open database for access
-      VpcId: '{{resolve:ssm:/deployer/backupandrestore-secondary/default-vpc:1}}'
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref EC2SecurityGroup
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  EC2SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open App access
-      VpcId: '{{resolve:ssm:/deployer/backupandrestore-secondary/default-vpc:1}}'
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  EC2SecurityGroupDBRule:
-    Type: 'AWS::EC2::SecurityGroupEgress'
-    Properties:
-      GroupId: !Ref EC2SecurityGroup
-      IpProtocol: tcp
-      FromPort: 3306
-      ToPort: 3306
-      DestinationSecurityGroupId: !Ref DBSecurityGroup
-  InstanceLogGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: 7
-  S3InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref S3Role
-  S3Role:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${AWS::StackName}-${AWS::Region}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-        - 'arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy'
-      Path: /
-  DBInstance:
-    Type: 'AWS::RDS::DBInstance'
-    DeletionPolicy: Delete
-    Properties:
-      DBName: unishop
-      DBInstanceIdentifier: !Ref 'AWS::StackName'
-      Engine: MySQL
-      DBInstanceClass: db.t3.micro
-      Port: '3306'
-      MasterUsername: UniShopAppV1User
-      MasterUserPassword: UniShopAppV1Password
-      VPCSecurityGroups:
-        - !Ref DBSecurityGroup
-      AllocatedStorage: '5'
-      MultiAZ: 'false'
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  EC2Instance:
-    Type: 'AWS::EC2::Instance'
-    DependsOn: DBInstance
-    CreationPolicy:
-      ResourceSignal:
-        Count: 1
-        Timeout: PT30M
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          default:
-            - update
-            - install
-            - configure
-            - create-tables
-        update:
-          commands:
-            update:
-              command: sudo yum update -y
-        install:
-          packages:
-            rpm:
-              'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-            yum:
-              amazon-cloudwatch-agent: []
-              java-1.8.0-openjdk-devel: []
-              mariadb: []
-        configure:
-          commands:
-            0-populate-buckets:
-              command: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/create_tables.sql /home/ec2-user/ --no-sign-request
-        create-tables:
-          commands:
-            1-create-tables:
-              command: !Join
-                - ''
-                - - 'sudo mysql -u UniShopAppV1User -h '
-                  - !GetAtt
-                    - DBInstance
-                    - Endpoint.Address
-                  - |2
-                     -P 3306 -pUniShopAppV1Password < /home/ec2-user/create_tables.sql
-    Properties:
-      InstanceType: t3.small
-      ImageId: !Ref LatestAmiId
-      SecurityGroupIds:
-        - !Ref EC2SecurityGroup
-      IamInstanceProfile: !Ref S3InstanceProfile
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash
-            - |
-              sudo yum install -y aws-cfn-bootstrap
-            - /opt/aws/bin/cfn-init -v
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource EC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - '         --configsets default'
-            - |+
-
-            - /opt/aws/bin/cfn-signal -e $?
-            - ' --stack '
-            - !Ref 'AWS::StackName'
-            - ' --resource EC2Instance'
-            - ' --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
diff --git a/static/Reliability/Disaster_Recovery/Code/HotStandby.yaml b/static/Reliability/Disaster_Recovery/Code/HotStandby.yaml
deleted file mode 100644
index b057384e4..000000000
--- a/static/Reliability/Disaster_Recovery/Code/HotStandby.yaml
+++ /dev/null
@@ -1,1448 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: 'Upgraded stack for hot standby Unicorn Shop with ALB'
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-    Description: 'Use an AMI of your choosing, we recommend to use the latest available'
-  IsPrimary:
-    Type: String
-    Default: 'yes'
-    AllowedValues:
-      - 'yes'
-      - 'no'
-    Description: 'Is primary region'
-Conditions:
-  CreatePrimaryDB:
-    !Equals [!Ref IsPrimary, 'yes']
-  CreateSecondaryDB:
-    !Equals [!Ref IsPrimary, 'no']
-  EnableWriteFwd:
-    !Equals [!Ref IsPrimary, 'no']
-  IsPrimaryRegion:
-    !Equals [!Ref IsPrimary, 'yes']
-Resources:
-  UniShopAppV1VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      EnableDnsSupport: 'true'
-      EnableDnsHostnames: 'true'
-      InstanceTenancy: default
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UniShopAppV1IGW:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  AttachGateway:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      InternetGatewayId: !Ref UniShopAppV1IGW
-  UniShopAppV1Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.0.0/24
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-1'
-  UniShopAppV1Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.1.0/24
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-2'
-  UniShopAppV1PublicRoutTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UniShopAppV1PublicRout:
-    Type: 'AWS::EC2::Route'
-    DependsOn: AttachGateway
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      GatewayId: !Ref UniShopAppV1IGW
-      DestinationCidrBlock: 0.0.0.0/0
-  UniShopAppV1PublicSubnetRoutTableAssoc1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet1
-  UniShopAppV1PublicSubnetRoutTableAssoc2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet2
-  DBSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open database for access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref EC2SecurityGroup
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  DBSubnetGroup:
-    Type: 'AWS::RDS::DBSubnetGroup'
-    Properties:
-      DBSubnetGroupDescription: UniShopAppV1DBSubnetGroup
-      SubnetIds:
-        - !Ref UniShopAppV1Subnet1
-        - !Ref UniShopAppV1Subnet2
-  EC2SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open App access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 8080
-          ToPort: 8080
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 8080
-          ToPort: 8080
-          CidrIp: 0.0.0.0/0
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-
-  #ALB and target groups
-  
-  EC2TargetGroup:
-    Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    Properties: 
-      Name: !If [IsPrimaryRegion, PrimaryTargetGroup, SecondaryTargetGroup]
-      Port: 8080
-      Protocol: HTTP
-      ProtocolVersion: HTTP1
-      Targets: 
-        - Id: !Ref EC2Instance
-      TargetType: 'instance'
-      VpcId: !Ref UniShopAppV1VPC
-
-  ALBListener:
-    Type: AWS::ElasticLoadBalancingV2::Listener
-    Properties:
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref EC2TargetGroup
-      LoadBalancerArn: !Ref ApplicationLoadBalancer
-      Port: 80
-      Protocol: HTTP
-
-  ApplicationLoadBalancer:
-    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
-    DependsOn: AttachGateway    
-    Properties:
-      Name: !If [IsPrimaryRegion, PrimaryALB, SecondaryALB]
-      Scheme: internet-facing
-      Subnets:
-      - Ref: UniShopAppV1Subnet1
-      - Ref: UniShopAppV1Subnet2
-      SecurityGroups:
-      - Ref: EC2SecurityGroup
-      IpAddressType: ipv4
-
-  EC2SecurityGroupDBRule:
-    Type: 'AWS::EC2::SecurityGroupEgress'
-    Properties:
-      GroupId: !Ref EC2SecurityGroup
-      IpProtocol: tcp
-      FromPort: 3306
-      ToPort: 3306
-      DestinationSecurityGroupId: !Ref DBSecurityGroup
-  InstanceLogGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: 7
-  S3InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref S3Role
-  S3Policy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: S3Policy
-      PolicyDocument:
-        Statement:
-          - Effect: Allow
-            Action:
-              - 's3:GetBucketLocation'
-              - 's3:GetObject'
-              - 's3:GetObjectAcl'
-              - 's3:PutObject'
-              - 's3:PutObjectAcl'
-            Resource:
-              - !GetAtt
-                - UIBucket
-                - Arn
-              - !GetAtt
-                - AssetBucket
-                - Arn
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - /*
-              - !Join
-                - ''
-                - - !GetAtt
-                    - AssetBucket
-                    - Arn
-                  - /*
-          - Effect: Allow
-            Action:
-              - 'rds:ModifyDBCluster'
-              - 'rds:Describe*'
-            Resource:
-              - '*'                        
-      Roles:
-        - !Ref S3Role
-  S3Role:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${AWS::StackName}-${AWS::Region}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-        - 'arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy'
-      Path: /
-  GlobalCluster:
-    Condition: CreatePrimaryDB
-    Type: 'AWS::RDS::GlobalCluster'
-    Properties:
-      GlobalClusterIdentifier: 'hot-global'
-      SourceDBClusterIdentifier: !Ref RDSClusterPrimary
-  RDSClusterPrimary:
-    Condition: CreatePrimaryDB
-    DeletionPolicy: Retain    
-    DependsOn:
-      - DBSubnetGroup
-    Type: 'AWS::RDS::DBCluster'
-    Properties:
-      MasterUsername: UniShopAppV1User
-      MasterUserPassword: UniShopAppV1Password
-      DBClusterIdentifier: !Ref 'AWS::StackName'
-      Port: 3306
-      DBClusterParameterGroupName: default.aurora-mysql5.7
-      Engine: aurora-mysql
-      EngineVersion: 5.7.mysql_aurora.2.11.1
-      VpcSecurityGroupIds:
-        - !Ref DBSecurityGroup
-      DBSubnetGroupName: !Ref DBSubnetGroup
-      DatabaseName: unishop
-  RDSClusterSecondary:
-    Condition: CreateSecondaryDB
-    DeletionPolicy: Retain    
-    DependsOn:
-      - DBSubnetGroup
-    Type: 'AWS::RDS::DBCluster'
-    Properties:
-      GlobalClusterIdentifier: 'hot-global'
-      DBClusterIdentifier: 'hot-secondary'
-      DBClusterParameterGroupName: default.aurora-mysql5.7
-      Engine: aurora-mysql
-      EngineVersion: 5.7.mysql_aurora.2.11.1
-      VpcSecurityGroupIds:
-        - !Ref DBSecurityGroup
-      DBSubnetGroupName: !Ref DBSubnetGroup
-  RDSDBInstance:
-    Type: 'AWS::RDS::DBInstance'
-    DeletionPolicy: Retain
-    Properties:
-      Engine: aurora-mysql
-      DBClusterIdentifier: !If [CreatePrimaryDB, !Ref RDSClusterPrimary, !Ref RDSClusterSecondary]
-      PubliclyAccessible: 'true'
-      DBInstanceClass: db.r5.xlarge
-      DBParameterGroupName: default.aurora-mysql5.7
-      DBInstanceIdentifier: unishop-hot
-  AssetBucket:
-    Type: 'AWS::S3::Bucket'      
-  UIBucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      WebsiteConfiguration:
-        ErrorDocument: error.html
-        IndexDocument: index.html
-      PublicAccessBlockConfiguration:
-        BlockPublicAcls: false
-        BlockPublicPolicy: false
-        IgnorePublicAcls: false
-        RestrictPublicBuckets: false         
-  UIBucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref UIBucket
-      PolicyDocument:
-        Statement:
-          -
-            Action:
-              - s3:GetObject
-            Effect: Allow
-            Resource:
-              Fn::Join:
-                - ''
-                - - 'arn:aws:s3:::'
-                  - Ref: 'UIBucket'
-                  - '/*'
-            Principal:
-              AWS:
-                - '*'             
-  EC2Instance:
-      Type: 'AWS::EC2::Instance'
-      DependsOn: RDSDBInstance
-      CreationPolicy:
-        ResourceSignal:
-          Count: 1
-          Timeout: PT30M        
-      Metadata:
-        'AWS::CloudFormation::Init':
-          configSets:
-            default:
-              - update
-              - setup
-              - install
-              - configure
-              - create-tables              
-              - create-service-files
-              - start-service
-              - setupnginx1
-              - setupnginx2
-            secondary:
-              - update
-              - setup
-              - install
-              - configure
-              - configure-global-db        
-              - create-service-files
-              - start-service
-              - setupnginx1
-              - setupnginx2
-          update:
-            commands:
-              update:
-                command: sudo yum update -y
-          setup:
-            files:
-              '/etc/cfn/cfn-hup.conf':
-                content: !Sub |
-                  [main]
-                  stack=${AWS::StackName}
-                  region=${AWS::Region}
-                  interval=1
-                mode: '000400'
-                owner: root
-                group: root
-              '/etc/cfn/hooks.d/cfn-auto-reloader.conf':
-                content: !Sub |
-                  [cfn-auto-reloader-hook]
-                  triggers=post.update
-                  path=Resources.EC2Instance.Metadata.AWS::CloudFormation::Init
-                  action=/opt/aws/bin/cfn-init --stack ${AWS::StackName} --resource EC2Instance --configsets default --region ${AWS::Region}
-                  runas=root
-                mode: "000400"
-                owner: root
-                group: root
-            services:
-              sysvinit:
-                cfn-hup:
-                  enabled: "true"
-                  ensureRunning: "true"
-                  files:
-                    - "/etc/cfn/cfn-hup.conf"
-                    - "/etc/cfn/hooks.d/cfn-auto-reloader.conf"
-          install:
-            packages:
-              rpm:
-                'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-              yum:
-                amazon-cloudwatch-agent: []
-                java-1.8.0-openjdk-devel: []
-                mariadb: []
-          configure:
-            commands:
-              0-populate-buckets:
-                command: !Join
-                  - ''
-                  - - |
-                      #!/bin/bash      
-                    - |
-                      sudo mkdir /home/ec2-user/UniShopUI/                                                                 
-                    - >
-                    - export ASSETS_RANDOM_NAME=
-                    - !Ref AssetBucket
-                    - |+      
-
-                    - >                  
-                      sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopLambda-0.0.1.jar /home/ec2-user/ --no-sign-request  
-                    - >                       
-                      aws s3 cp /home/ec2-user/UniShopLambda-0.0.1.jar
-                      s3://$ASSETS_RANDOM_NAME/   
-                    - >                  
-                      sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopAppV1-0.0.1-SNAPSHOT.jar /home/ec2-user/ --no-sign-request  
-                    - >
-                      sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/create_tables.sql /home/ec2-user/ --no-sign-request                        
-                      
-          create-tables:
-            commands:
-              1-create-tables:
-                command: !Join
-                  - ''
-                  - - 'sudo mysql -u UniShopAppV1User -h '
-                    - !If [CreatePrimaryDB, !GetAtt RDSClusterPrimary.Endpoint.Address, !GetAtt RDSClusterSecondary.ReadEndpoint.Address]
-                    - |2
-                       -P 3306 -pUniShopAppV1Password < /home/ec2-user/create_tables.sql                     
-          configure-global-db:
-            commands:
-              1-enable-write-forwarding:
-                command: sudo aws rds modify-db-cluster --db-cluster-identifier hot-secondary --region us-west-1 --enable-global-write-forwarding                                  
-          create-service-files:
-            files:
-              /etc/systemd/system/unishop.service:
-                encoding: plain
-                content: !Join
-                  - ''
-                  - - |
-                      [Unit]
-                    - |
-                      Description=Restart UniShop
-                    - |
-                      Wants=network.target
-                    - >
-                      After=syslog.target network-online.target
-                      amazon-cloudwatch-agent.target
-                    - |+
-
-                    - |
-                      [Service]
-                    - |
-                      Type=forking
-                    - |
-                      ExecStart=/home/ec2-user/unishopstart.sh
-                    - |
-                      ExecReload=/home/ec2-user/unishoprestart.sh
-                    - |
-                      ExecStop=/home/ec2-user/unishopstop.sh
-                    - |                                    
-                      PrivateTmp=true
-                    - |+
-
-                    - |
-                      [Install]
-                    - |
-                      WantedBy=multi-user.target
-                mode: '000644'
-                group: root
-                user: root
-              /home/ec2-user/unishopcfg.sh:
-                encoding: plain
-                content: !Join
-                  - ''
-                  - - |
-                      #!/bin/bash
-                    - export DB_ENDPOINT=
-                    - !If [CreatePrimaryDB, !GetAtt RDSClusterPrimary.Endpoint.Address, !GetAtt RDSClusterSecondary.ReadEndpoint.Address]
-                    - |+                  
-                mode: '000555'
-                group: ec2-user
-                user: ec2-user
-              /home/ec2-user/unishoprestart.sh:
-                encoding: plain
-                content: !Join
-                  - ''
-                  - - |
-                      #!/bin/bash
-                    - |                    
-                      source /home/ec2-user/unishopstop.sh
-                    - |
-                      source /home/ec2-user/unishopstart.sh     
-                    - |+
-                mode: '000555'
-                group: ec2-user
-                user: ec2-user
-              /home/ec2-user/unishopstop.sh:
-                encoding: plain
-                content: !Join
-                  - ''
-                  - - |
-                      #!/bin/bash
-                    - |
-                      APP_NAME=UniShopAppV1-0.0.1-SNAPSHOT.jar                                                                     
-                    - | 
-                      pid=`ps -ef | grep $APP_NAME | grep -v grep | awk '{print $2}'`
-                    - |
-                      if [ -z "${pid}" ]; 
-                    - |
-                      then echo ""
-                    - |
-                      else
-                    - |
-                      echo "kill thread...$pid"
-                    - |
-                      kill -9 $pid                  
-                    - |
-                      fi
-                mode: '000555'
-                group: ec2-user
-                user: ec2-user              
-              /home/ec2-user/unishopstart.sh:
-                encoding: plain
-                content: !Join
-                  - ''
-                  - - |
-                      #!/bin/bash
-                    - |                    
-                      source /home/ec2-user/unishopcfg.sh   
-                    - >
-                    - java -jar
-                    - ' '
-                    - !If [EnableWriteFwd, '-Dspring.profiles.active=warm ','']
-                    - >
-                      /home/ec2-user/UniShopAppV1-0.0.1-SNAPSHOT.jar
-                      &>
-                      /home/ec2-user/app.log
-                      &
-                mode: '000555'
-                group: ec2-user
-                user: ec2-user              
-              /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json:
-                content: !Join
-                  - ''
-                  - - |
-                      {
-                    - |2
-                          "logs": {
-                    - |2
-                              "logs_collected": {
-                    - |2
-                                  "files": {
-                    - |2
-                                      "collect_list": [
-                    - |2
-                                          {
-                    - |2
-                                              "file_path": "/home/ec2-user/app.log",
-                    - !Join
-                      - ''
-                      - - '                        "log_group_name":'
-                        - '"'
-                        - !Ref InstanceLogGroup
-                        - |
-                          ",
-                    - !Join
-                      - ''
-                      - - '                        "log_stream_name":'
-                        - '"'
-                        - !Ref InstanceLogGroup
-                        - |
-                          -app",
-                    - |2
-                                              "timezone": "Local"
-                    - |2
-                                          }
-                    - |2
-                                      ]
-                    - |2
-                                  }
-                    - |2
-                              }
-                    - |2
-                          }
-                    - '}'
-                mode: '000444'
-                group: ec2-user
-                user: ec2-user
-          start-service:
-            commands:
-              0-start-service:
-                command: !Join
-                  - ''
-                  - - |
-                      sudo systemctl daemon-reload
-                    - |
-                      sudo systemctl enable unishop
-                    - |
-                      sudo systemctl start unishop
-                    - >
-                      sudo amazon-cloudwatch-agent-ctl -a fetch-config -s -m ec2
-                      -c
-                      file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
-          setupnginx1:
-            commands:
-              amznextras:
-                command: "sudo amazon-linux-extras install nginx1 -y"
-          setupnginx2:
-            files:
-              /etc/nginx/nginx.conf:
-                content: !Sub
-                  - |
-                      user nginx;
-                      worker_processes auto;
-                      error_log /var/log/nginx/error.log;
-                      pid /run/nginx.pid;
-
-                      include /usr/share/nginx/modules/*.conf;
-
-                      events {
-                        worker_connections 1024;
-                      }
-
-                      http {
-                        log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                                          '$status @body_bytes_sent "@http_referer" '
-                                          '"@http_user_agent" "@http_x_forwarded_for"';
-
-                        access_log  /var/log/nginx/access.log main;
-
-                        sendfile            on;
-                        tcp_nopush          on;
-                        tcp_nodelay         on;
-                        keepalive_timeout   65;
-                        types_hash_max_size 4096;
-
-                        include             /etc/nginx/mime.types;
-                        default_type        application/octet-stream;
-
-                        include /etc/nginx/conf.d/*.conf;
-
-                        server {
-                          listen        8080;
-                          listen        [::]:8080;
-                          location / {
-                            proxy_pass ${S3Url};
-                          }
-                          server_name   _;
-                          root          /usr/share/nginx/html;
-
-                          include /etc/nginx/default.d/*.conf;
-
-                          error_page 404 /404.html;
-                          location = /404.html {
-                          }
-
-                          error_page 500 502 503 504 /50x.html;
-                          location = /50x.html {
-                          }
-                        }
-                      }
-                  - 
-                    S3Url: !GetAtt UIBucket.WebsiteURL
-                mode: '000644'
-                owner: root
-                group: root
-            services:
-              sysvinit:
-                nginx:
-                  enabled: 'true'
-                  ensureRunning: 'true'
-                  files:
-                    - "/usr/share/nginx/index.html"
-                  sources:
-                    - "/etc/nginx/nginx.conf"
-      Properties:
-        InstanceType: t3.small
-        ImageId: !Ref LatestAmiId
-        SubnetId: !Ref UniShopAppV1Subnet1
-        SecurityGroupIds:
-          - !Ref EC2SecurityGroup
-        IamInstanceProfile: !Ref S3InstanceProfile
-        UserData: !Base64
-          'Fn::Join':
-            - ''
-            - - |
-                #!/bin/bash
-              - |
-                sudo yum install -y aws-cfn-bootstrap
-              - |
-                exec > >(tee /var/log/user-data.log | logger -t user-data -s 2>/dev/console) 2>&1
-              - /opt/aws/bin/cfn-init -v
-              - '         --stack '
-              - !Ref 'AWS::StackName'
-              - '         --resource EC2Instance '
-              - '         --region '
-              - !Ref 'AWS::Region'
-              - !If [CreatePrimaryDB, '         --configsets default','         --configsets secondary']
-              - |+
-
-              - /opt/aws/bin/cfn-signal -e $?
-              - ' --stack '
-              - !Ref 'AWS::StackName'
-              - ' --resource EC2Instance'
-              - ' --region '
-              - !Ref 'AWS::Region'
-              - |+
-
-        Tags:
-          - Key: Name
-            Value: !Ref 'AWS::StackName'
-  DynamoDBTable:
-    Condition: CreatePrimaryDB
-    Type: AWS::DynamoDB::Table
-    Properties:
-      TableName: unishophotstandby
-      BillingMode: PAY_PER_REQUEST
-      AttributeDefinitions:
-        - AttributeName: uuid
-          AttributeType: S
-      KeySchema:
-        - AttributeName: uuid
-          KeyType: HASH
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - sts:AssumeRole
-      Path: /service-role/
-      Policies:
-        - PolicyName: s3get
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - dynamodb:GetItem
-                  - dynamodb:DeleteItem
-                  - dynamodb:PutItem
-                  - dynamodb:UpdateItem
-                  - dynamodb:Query
-                  - dynamodb:Scan
-                Resource: !If [CreatePrimaryDB, !GetAtt DynamoDBTable.Arn, !Sub 'arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/unishophotstandby']
-  AddUnicornToBasket:
-    DependsOn: EC2Instance
-    Type: AWS::Lambda::Function
-    Properties:
-      Code:
-        S3Bucket: !Ref AssetBucket
-        S3Key: 'UniShopLambda-0.0.1.jar'
-      Runtime: java8
-      Description: Service to add unicorns to basket from POST API call
-      Handler: com.uniShopApp.Lambda.UnicornBasketImpl::addUnicornToBasket
-      MemorySize: 512
-      Role: !GetAtt
-        - LambdaRole
-        - Arn
-      Timeout: 15
-      Tags:
-        - Key: Name
-          Value: AddUnicornToBasket
-  RemoveUnicornFromBasket:
-    DependsOn: EC2Instance
-    Type: AWS::Lambda::Function
-    Properties:
-      Code:
-        S3Bucket: !Ref AssetBucket
-        S3Key: 'UniShopLambda-0.0.1.jar'
-      Runtime: java8
-      Description: Service to remove unicorns from basket from POST API call
-      Handler: com.uniShopApp.Lambda.UnicornBasketImpl::removeUnicornFromBasket
-      MemorySize: 512
-      Role: !GetAtt
-        - LambdaRole
-        - Arn
-      Timeout: 15
-      Tags:
-        - Key: Name
-          Value: RemoveUnicornFromBasket
-  GetUnicornsBasket:
-    DependsOn: EC2Instance
-    Type: AWS::Lambda::Function
-    Properties:
-      Code:
-        S3Bucket: !Ref AssetBucket
-        S3Key: 'UniShopLambda-0.0.1.jar'
-      Runtime: java8
-      Description: Service to get unicorn basket
-      Handler: com.uniShopApp.Lambda.UnicornBasketImpl::getUnicornsBasket
-      MemorySize: 512
-      Role: !GetAtt
-        - LambdaRole
-        - Arn
-      Timeout: 15
-      Tags:
-        - Key: Name
-          Value: GetUnicornsBasket
-  UnicornsRestApi:
-    Type: 'AWS::ApiGateway::RestApi'
-    Properties:
-      Name: UnicornsAPIs
-      Description: API used for Unicorn Requests
-      FailOnWarnings: true
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  LambdaPermissionPOST:
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:invokeFunction'
-      FunctionName: !GetAtt
-        - AddUnicornToBasket
-        - Arn
-      Principal: apigateway.amazonaws.com
-      SourceArn: !Join
-        - ''
-        - - 'arn:aws:execute-api:'
-          - !Ref 'AWS::Region'
-          - ':'
-          - !Ref 'AWS::AccountId'
-          - ':'
-          - !Ref UnicornsRestApi
-          - /*
-  LambdaPermissionDELETE:
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:invokeFunction'
-      FunctionName: !GetAtt
-        - RemoveUnicornFromBasket
-        - Arn
-      Principal: apigateway.amazonaws.com
-      SourceArn: !Join
-        - ''
-        - - 'arn:aws:execute-api:'
-          - !Ref 'AWS::Region'
-          - ':'
-          - !Ref 'AWS::AccountId'
-          - ':'
-          - !Ref UnicornsRestApi
-          - /*
-  LambdaPermissionGET:
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:invokeFunction'
-      FunctionName: !GetAtt
-        - GetUnicornsBasket
-        - Arn
-      Principal: apigateway.amazonaws.com
-      SourceArn: !Join
-        - ''
-        - - 'arn:aws:execute-api:'
-          - !Ref 'AWS::Region'
-          - ':'
-          - !Ref 'AWS::AccountId'
-          - ':'
-          - !Ref UnicornsRestApi
-          - /*
-  ApiGatewayCloudWatchLogsRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - apigateway.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Policies:
-        - PolicyName: ApiGatewayLogsPolicy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:DescribeLogGroups'
-                  - 'logs:DescribeLogStreams'
-                  - 'logs:PutLogEvents'
-                  - 'logs:GetLogEvents'
-                  - 'logs:FilterLogEvents'
-                Resource: '*'
-  ApiGatewayAccount:
-    Type: 'AWS::ApiGateway::Account'
-    Properties:
-      CloudWatchRoleArn: !GetAtt
-        - ApiGatewayCloudWatchLogsRole
-        - Arn
-  UnicornsRestApiStage:
-    DependsOn: ApiGatewayAccount
-    Type: 'AWS::ApiGateway::Stage'
-    Properties:
-      DeploymentId: !Ref ApiDeployment
-      MethodSettings:
-        - DataTraceEnabled: true
-          HttpMethod: '*'
-          LoggingLevel: INFO
-          ResourcePath: /*
-      RestApiId: !Ref UnicornsRestApi
-      StageName: Production
-  ApiDeployment:
-    Type: 'AWS::ApiGateway::Deployment'
-    DependsOn:
-      - UnicornsRestApiRequestGET
-      - UnicornsBasketUUIDRestApiRequestGET
-      - UnicornsBasketRestApiRequestDELETE
-      - UnicornsBasketRestApiRequestPOST
-      - UserRestApiRequestPOST
-      - UserLoginRestApiRequestPOST
-    Properties:
-      RestApiId: !Ref UnicornsRestApi
-  UnicornsRestApiResource:
-    Type: 'AWS::ApiGateway::Resource'
-    Properties:
-      RestApiId: !Ref UnicornsRestApi
-      ParentId: !GetAtt
-        - UnicornsRestApi
-        - RootResourceId
-      PathPart: unicorns
-  UnicornsBasketRestApiResource:
-    Type: 'AWS::ApiGateway::Resource'
-    Properties:
-      RestApiId: !Ref UnicornsRestApi
-      ParentId: !Ref UnicornsRestApiResource
-      PathPart: basket
-  UnicornsBasketUUIDRestApiResource:
-    Type: 'AWS::ApiGateway::Resource'
-    Properties:
-      RestApiId: !Ref UnicornsRestApi
-      ParentId: !Ref UnicornsBasketRestApiResource
-      PathPart: '{uuid}'
-  UserRestApiResource:
-    Type: 'AWS::ApiGateway::Resource'
-    Properties:
-      RestApiId: !Ref UnicornsRestApi
-      ParentId: !GetAtt
-        - UnicornsRestApi
-        - RootResourceId
-      PathPart: user
-  UserLoginRestApiResource:
-    Type: 'AWS::ApiGateway::Resource'
-    Properties:
-      RestApiId: !Ref UnicornsRestApi
-      ParentId: !Ref UserRestApiResource
-      PathPart: login
-  UnicornsRestApiRequestGET:
-    DependsOn: EC2Instance
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: GET
-      Integration:
-        IntegrationHttpMethod: GET
-        Type: HTTP
-        Uri: !Join
-          - '/'
-          - - 'http:/'
-            - !GetAtt
-              - EC2Instance
-              - PublicDnsName
-            - 'unicorns'
-        PassthroughBehavior: WHEN_NO_MATCH
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-      ResourceId: !Ref UnicornsRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UnicornsRestApiRequestOPTIONS:
-    Type: "AWS::ApiGateway::Method"
-    Properties:
-      ResourceId: !Ref UnicornsRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      AuthorizationType: NONE
-      HttpMethod: OPTIONS
-      Integration:
-        Type: MOCK
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-        PassthroughBehavior: NEVER
-        RequestTemplates:
-          application/json: '{"statusCode": 200}'
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UnicornsBasketRestApiRequestPOST:
-    DependsOn: EC2Instance
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: POST
-      Integration:
-        Type: AWS
-        IntegrationHttpMethod: POST
-        Uri: !Join
-          - ''
-          - - 'arn:aws:apigateway:'
-            - !Ref 'AWS::Region'
-            - ':lambda:path/2015-03-31/functions/'
-            - !GetAtt
-              - AddUnicornToBasket
-              - Arn
-            - /invocations
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-      ResourceId: !Ref UnicornsBasketRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UnicornsBasketRestApiRequestDELETE:
-    DependsOn: EC2Instance
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: DELETE
-      Integration:
-        Type: AWS
-        IntegrationHttpMethod: POST
-        Uri: !Join
-          - ''
-          - - 'arn:aws:apigateway:'
-            - !Ref 'AWS::Region'
-            - ':lambda:path/2015-03-31/functions/'
-            - !GetAtt
-              - RemoveUnicornFromBasket
-              - Arn
-            - /invocations
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-      ResourceId: !Ref UnicornsBasketRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UnicornsBasketRestApiRequestOPTIONS:
-    Type: "AWS::ApiGateway::Method"
-    Properties:
-      ResourceId: !Ref UnicornsBasketRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      AuthorizationType: NONE
-      HttpMethod: OPTIONS
-      Integration:
-        Type: MOCK
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-        PassthroughBehavior: NEVER
-        RequestTemplates:
-          application/json: '{"statusCode": 200}'
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UnicornsBasketUUIDRestApiRequestGET:
-    DependsOn: EC2Instance
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: GET
-      RequestParameters:
-        method.request.path.uuid: true
-      Integration:
-        Type: AWS
-        IntegrationHttpMethod: POST
-        RequestParameters:
-          integration.request.path.uuid: method.request.path.uuid
-        Uri: !Join
-          - ''
-          - - 'arn:aws:apigateway:'
-            - !Ref 'AWS::Region'
-            - ':lambda:path/2015-03-31/functions/'
-            - !GetAtt
-              - GetUnicornsBasket
-              - Arn
-            - /invocations
-        RequestTemplates:
-          application/json: |
-            #set($inputRoot = $input.path('$'))
-            {
-              "uuid" : "$input.params('uuid')"
-            }
-        PassthroughBehavior: WHEN_NO_TEMPLATES
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-      ResourceId: !Ref UnicornsBasketUUIDRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UnicornsBasketUUIDRestApiRequestOPTIONS:
-    Type: "AWS::ApiGateway::Method"
-    Properties:
-      ResourceId: !Ref UnicornsBasketUUIDRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      AuthorizationType: NONE
-      HttpMethod: OPTIONS
-      Integration:
-        Type: MOCK
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-        PassthroughBehavior: NEVER
-        RequestTemplates:
-          application/json: '{"statusCode": 200}'
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UserRestApiRequestPOST:
-    DependsOn: EC2Instance
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: POST
-      Integration:
-        IntegrationHttpMethod: POST
-        Type: HTTP
-        Uri: !Join
-          - '/'
-          - - 'http:/'
-            - !GetAtt
-              - EC2Instance
-              - PublicDnsName
-            - 'user'
-        PassthroughBehavior: WHEN_NO_MATCH
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-      ResourceId: !Ref UserRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UserRestApiRequestOPTIONS:
-    Type: "AWS::ApiGateway::Method"
-    Properties:
-      ResourceId: !Ref UserRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      AuthorizationType: NONE
-      HttpMethod: OPTIONS
-      Integration:
-        Type: MOCK
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-        PassthroughBehavior: NEVER
-        RequestTemplates:
-          application/json: '{"statusCode": 200}'
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UserLoginRestApiRequestPOST:
-    DependsOn: EC2Instance
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: POST
-      Integration:
-        IntegrationHttpMethod: POST
-        Type: HTTP
-        Uri: !Join
-          - '/'
-          - - 'http:/'
-            - !GetAtt
-              - EC2Instance
-              - PublicDnsName
-            - 'user'
-            - 'login'
-        PassthroughBehavior: WHEN_NO_MATCH
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-      ResourceId: !Ref UserLoginRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  UserLoginRestApiRequestOPTIONS:
-    Type: "AWS::ApiGateway::Method"
-    Properties:
-      ResourceId: !Ref UserLoginRestApiResource
-      RestApiId: !Ref UnicornsRestApi
-      AuthorizationType: NONE
-      HttpMethod: OPTIONS
-      Integration:
-        Type: MOCK
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'GET,POST,PUT,DELETE,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-            ResponseTemplates:
-              application/json: ''
-            StatusCode: '200'
-        PassthroughBehavior: NEVER
-        RequestTemplates:
-          application/json: '{"statusCode": 200}'
-      MethodResponses:
-        - ResponseModels:
-            application/json: Empty
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Methods: true
-            method.response.header.Access-Control-Allow-Origin: true
-          StatusCode: '200'
-  BuildEC2Instance:
-    DependsOn: ApiDeployment
-    Type: 'AWS::EC2::Instance'
-    CreationPolicy:
-      ResourceSignal:
-        Count: 1
-        Timeout: PT30M
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          default:
-            - update
-            - install
-            - configure
-        update:
-          commands:
-            update:
-              command: sudo yum update -y
-        install:
-          packages:
-            rpm:
-              'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-            yum:
-              amazon-cloudwatch-agent: []
-              mariadb: []
-              java-1.8.0-openjdk-devel: []
-        configure:
-          commands:
-            0-populate-buckets:
-              command: !Join
-                - ''
-                - - |
-                    #!/bin/bash      
-
-                  - |
-                    sudo mkdir /home/ec2-user/UniShopUI/                              
-                
-                  - export AWS_DEFAULT_REGION=
-                  - !Ref 'AWS::Region'
-                  - |+
-
-                  - export UI_RANDOM_NAME=
-                  - !Ref UIBucket
-                  - |+                                
-
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopUI/
-                    /home/ec2-user/UniShopUI/ --no-sign-request --recursive                                                                 
-
-                  - >
-                    aws s3 cp /home/ec2-user/UniShopUI/
-                    s3://$UI_RANDOM_NAME/ --recursive                       
-
-                  - >            
-                  - export APIGW=
-                  - !Sub "https://${UnicornsRestApi}.execute-api.${AWS::Region}.amazonaws.com/${UnicornsRestApiStage}/"
-                  - |+                 
-
-                  - export JSON_STRING=
-                  - $(echo '{"host":"'"$APIGW"'","region":"'"$AWS_DEFAULT_REGION"'"}')    
-                  - |+                                                 
-
-                  - |
-                    echo $JSON_STRING | sudo tee /home/ec2-user/UniShopUI/config.json                          
-
-                  - >
-                    aws s3 cp /home/ec2-user/UniShopUI/config.json
-                    s3://$UI_RANDOM_NAME/               
- 
-    Properties:
-      InstanceType: t3.small
-      ImageId: !Ref LatestAmiId
-      SubnetId: !Ref UniShopAppV1Subnet1
-      SecurityGroupIds:
-        - !Ref EC2SecurityGroup
-      IamInstanceProfile: !Ref S3InstanceProfile
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash
-            - |
-              sudo yum install -y aws-cfn-bootstrap
-            - /opt/aws/bin/cfn-init -v
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource BuildEC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - '         --configsets default '
-            - |+
-
-            - /opt/aws/bin/cfn-signal -e $?
-            - ' --stack '
-            - !Ref 'AWS::StackName'
-            - ' --resource BuildEC2Instance'
-            - ' --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-build'          
-Outputs:
-  WebsiteURL:
-    Value: !GetAtt UIBucket.WebsiteURL
-    Description: Website URL
\ No newline at end of file
diff --git a/static/Reliability/Disaster_Recovery/Code/PilotLightDR.yaml b/static/Reliability/Disaster_Recovery/Code/PilotLightDR.yaml
deleted file mode 100644
index c1124f5bc..000000000
--- a/static/Reliability/Disaster_Recovery/Code/PilotLightDR.yaml
+++ /dev/null
@@ -1,590 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: 'This deployment includes SSM, CloudWatch, and allows instance reboot'
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-    Description: 'Use an AMI of your choosing, we recommend to use the latest available'
-  IsPrimary:
-    Type: String
-    Default: 'yes'
-    AllowedValues:
-      - 'yes'
-      - 'no'
-    Description: 'Is primary region'
-Conditions:
-  CreatePrimaryDB:
-    !Equals [!Ref IsPrimary, 'yes']
-  CreateSecondaryDB:
-    !Equals [!Ref IsPrimary, 'no']
-Resources:
-  UniShopAppV1VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      EnableDnsSupport: 'true'
-      EnableDnsHostnames: 'true'
-      InstanceTenancy: default
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UniShopAppV1IGW:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  AttachGateway:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      InternetGatewayId: !Ref UniShopAppV1IGW
-  UniShopAppV1Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.0.0/24
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value:  !Sub '${AWS::StackName}-1'
-  UniShopAppV1Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.1.0/24
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value:  !Sub '${AWS::StackName}-2'
-  UniShopAppV1PublicRoutTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  UniShopAppV1PublicRout:
-    Type: 'AWS::EC2::Route'
-    DependsOn: AttachGateway
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      GatewayId: !Ref UniShopAppV1IGW
-      DestinationCidrBlock: 0.0.0.0/0
-  UniShopAppV1PublicSubnetRoutTableAssoc1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet1
-  UniShopAppV1PublicSubnetRoutTableAssoc2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet2
-  DBSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open database for access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref EC2SecurityGroup
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  DBSubnetGroup:
-    Type: 'AWS::RDS::DBSubnetGroup'
-    Properties:
-      DBSubnetGroupDescription: UniShopAppV1DBSubnetGroup
-      SubnetIds:
-        - !Ref UniShopAppV1Subnet1
-        - !Ref UniShopAppV1Subnet2
-  EC2SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open App access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      Tags:
-        - Key: Name
-          Value: !Ref 'AWS::StackName'
-  EC2SecurityGroupDBRule:
-    Type: 'AWS::EC2::SecurityGroupEgress'
-    Properties:
-      GroupId: !Ref EC2SecurityGroup
-      IpProtocol: tcp
-      FromPort: 3306
-      ToPort: 3306
-      DestinationSecurityGroupId: !Ref DBSecurityGroup
-  InstanceLogGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: 7
-  S3InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref S3Role
-  S3Policy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: !Sub S3Policy-pilot
-      PolicyDocument:
-        Statement:
-          - Sid: AllowForOther
-            Effect: Allow
-            Action:
-              - 's3:GetBucketLocation'
-              - 's3:GetObject'
-              - 's3:PutObject'      
-              - 's3:ListAllMyBuckets'
-              - 's3:ListBucket'
-              - 's3:CreateBucket'              
-            Resource:
-              - !GetAtt
-                - UIBucket
-                - Arn
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - /*
-          - Sid: AllowForListBucket
-            Effect: Allow
-            Action:
-              - 's3:ListAllMyBuckets'
-            Resource:
-              - 'arn:aws:s3:::*'         
-          - Sid: AllowForRDS
-            Effect: Allow
-            Action:
-              - 'rds:Describe*'
-            Resource:
-              - '*'                     
-      Roles:
-        - !Ref S3Role
-  S3Role:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName:  !Sub '${AWS::StackName}-${AWS::Region}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-        - 'arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy'
-      Path: /
-  GlobalCluster:
-    Condition: CreatePrimaryDB
-    Type: 'AWS::RDS::GlobalCluster'
-    Properties:
-      GlobalClusterIdentifier: !Sub 'pilot-global'
-      SourceDBClusterIdentifier: !Ref RDSClusterPrimary
-  RDSClusterPrimary:
-    Condition: CreatePrimaryDB
-    DependsOn:
-      - DBSubnetGroup
-    Type: 'AWS::RDS::DBCluster'
-    DeletionPolicy: Retain
-    Properties:
-      MasterUsername: UniShopAppV1User
-      MasterUserPassword: UniShopAppV1Password
-      DBClusterIdentifier: !Ref 'AWS::StackName'
-      Port: 3306
-      DBClusterParameterGroupName: default.aurora-mysql5.7
-      Engine: aurora-mysql
-      EngineVersion: 5.7.mysql_aurora.2.11.1
-      VpcSecurityGroupIds:
-         - !Ref DBSecurityGroup
-      DBSubnetGroupName: !Ref DBSubnetGroup
-      DatabaseName: unishop
-  RDSClusterSecondary:
-    Condition: CreateSecondaryDB
-    DependsOn:
-      - DBSubnetGroup
-    Type: 'AWS::RDS::DBCluster'
-    DeletionPolicy: Retain
-    Properties:
-      GlobalClusterIdentifier: !Sub 'pilot-global'
-      DBClusterIdentifier: !Sub 'pilot-secondary'
-      DBClusterParameterGroupName: default.aurora-mysql5.7
-      Engine: aurora-mysql
-      EngineVersion: 5.7.mysql_aurora.2.11.1
-      VpcSecurityGroupIds:
-         - !Ref DBSecurityGroup
-      DBSubnetGroupName: !Ref DBSubnetGroup
-  RDSDBInstance:
-    Type: 'AWS::RDS::DBInstance'
-    DeletionPolicy: Retain
-    Properties:
-      Engine: aurora-mysql
-      DBClusterIdentifier: !If [CreatePrimaryDB, !Ref RDSClusterPrimary, !Ref RDSClusterSecondary]
-      PubliclyAccessible: 'true'
-      DBInstanceClass: db.r5.xlarge
-      DBParameterGroupName: default.aurora-mysql5.7
-      DBInstanceIdentifier: unishop
-  UIBucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      WebsiteConfiguration:
-        ErrorDocument: error.html
-        IndexDocument: index.html
-      PublicAccessBlockConfiguration:
-        BlockPublicAcls: false
-        BlockPublicPolicy: false
-        IgnorePublicAcls: false
-        RestrictPublicBuckets: false         
-  UIBucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref UIBucket
-      PolicyDocument:
-        Statement:
-          -
-            Action:
-              - s3:GetObject
-            Effect: Allow
-            Resource:
-              Fn::Join:
-                - ''
-                - - 'arn:aws:s3:::'
-                  - Ref: 'UIBucket'
-                  - '/*'
-            Principal:
-              AWS:
-                - '*'              
-  EC2Instance:
-    Condition: CreatePrimaryDB
-    Type: 'AWS::EC2::Instance'
-    DependsOn: RDSDBInstance
-    CreationPolicy:
-      ResourceSignal:
-        Count: 1
-        Timeout: PT30M
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          default:
-            - update
-            - install
-            - configure
-            - create-tables
-            - create-service-files
-            - start-service
-        update:
-          commands:
-            update:
-              command: sudo yum update -y
-        install:
-          packages:
-            rpm:
-              'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-            yum:
-              amazon-cloudwatch-agent: []
-              mariadb: []
-              java-1.8.0-openjdk-devel: []
-        configure:
-          commands:
-            0-populate-buckets:
-              command: !Join
-                - ''
-                - - |
-                    #!/bin/bash      
-
-                  - |
-                    sudo mkdir /home/ec2-user/UniShopUI/                              
-                
-                  - export AWS_DEFAULT_REGION=
-                  - !Ref 'AWS::Region'
-                  - |+
-
-                  - export UI_RANDOM_NAME=
-                  - !Ref UIBucket
-                  - |+                                          
-
-                  - export HOSTNAME=
-                  - "http://"
-                  - $(curl -s http://169.254.169.254/latest/meta-data/public-hostname)
-                  - |+
-
-                  - export JSON_STRING=
-                  - $(echo '{"host":"'"$HOSTNAME"'","region":"'"$AWS_DEFAULT_REGION"'"}')
-                  - |+
-
-                  - >
-                    aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopUI/
-                    /home/ec2-user/UniShopUI/ --no-sign-request --recursive                                                    
-
-                  - |
-                    echo $JSON_STRING | sudo tee /home/ec2-user/UniShopUI/config.json                          
-
-                  - >
-                    aws s3 cp /home/ec2-user/UniShopUI/
-                    s3://$UI_RANDOM_NAME/ --recursive  
-                    
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopAppV1-0.0.1-SNAPSHOT.jar /home/ec2-user/ --no-sign-request  
-
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/create_tables.sql /home/ec2-user/ --no-sign-request    
- 
-        create-tables:
-          commands:
-            1-create-tables:
-              command: !Join
-                - ''
-                - - 'sudo mysql -u UniShopAppV1User -h '
-                  - !GetAtt RDSClusterPrimary.Endpoint.Address
-                  - |2
-                     -P 3306 -pUniShopAppV1Password < /home/ec2-user/create_tables.sql
-        create-service-files:
-          files:
-            /etc/systemd/system/unishop.service:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    [Unit]
-                  - |
-                    Description=Restart UniShop
-                  - |
-                    Wants=network.target
-                  - >
-                    After=syslog.target network-online.target
-                    amazon-cloudwatch-agent.target
-                  - |+
-
-                  - |
-                    [Service]
-                  - |
-                    Type=forking
-                  - |
-                    ExecStart=/home/ec2-user/unishopstart.sh
-                  - |
-                    ExecReload=/home/ec2-user/unishoprestart.sh
-                  - |
-                    ExecStop=/home/ec2-user/unishopstop.sh
-                  - |                                    
-                    PrivateTmp=true
-                  - |+
-
-                  - |
-                    [Install]
-                  - |
-                    WantedBy=multi-user.target
-              mode: '000644'
-              group: root
-              user: root
-            /home/ec2-user/unishopcfg.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - export DB_ENDPOINT=
-                  - !GetAtt RDSClusterPrimary.Endpoint.Address
-                  - |+                  
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user
-            /home/ec2-user/unishoprestart.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |          
-                    source /home/ec2-user/unishopstop.sh                   
-                  - |
-                    source /home/ec2-user/unishopstart.sh
-                  - |+
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user
-            /home/ec2-user/unishopstop.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |
-                    APP_NAME=UniShopAppV1-0.0.1-SNAPSHOT.jar                                                                     
-                  - | 
-                    pid=`ps -ef | grep $APP_NAME | grep -v grep | awk '{print $2}'`
-                  - |
-                    if [ -z "${pid}" ]; 
-                  - |
-                    then echo ""
-                  - |
-                    else
-                  - |
-                    echo "kill thread...$pid"
-                  - |
-                    kill -9 $pid                  
-                  - |
-                    fi
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user              
-            /home/ec2-user/unishopstart.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |          
-                    export AWS_DEFAULT_REGION=$(curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | python -c "import json,sys; print json.loads(sys.stdin.read())['region']")
-                  - |
-                    export UI_RANDOM_NAME=$(aws s3api list-buckets --region $AWS_DEFAULT_REGION --output text --query 'Buckets[?starts_with(Name, `pilot-secondary-`) == `true`]'.Name)
-                  - |
-                    export HOSTNAME="http://$(curl -s http://169.254.169.254/latest/meta-data/public-hostname)"
-                  - |
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopUI/ /home/ec2-user/UniShopUI/ --no-sign-request --recursive                     
-                  - |
-                    echo '{"host":"'"$HOSTNAME"'","region":"'"$AWS_DEFAULT_REGION"'"}' | sudo tee /home/ec2-user/UniShopUI/config.json                    
-                  - |
-                    sudo aws s3 cp /home/ec2-user/UniShopUI/ s3://$UI_RANDOM_NAME/ --recursive   
-                  - |
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopAppV1-0.0.1-SNAPSHOT.jar /home/ec2-user/ --no-sign-request                                               
-                  - |                    
-                    source /home/ec2-user/unishopcfg.sh            
-                  - |                                            
-                  - java -jar /home/ec2-user/UniShopAppV1-0.0.1-SNAPSHOT.jar &> /home/ec2-user/app.log &
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user              
-            /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json:
-              content: !Join
-                - ''
-                - - |
-                    {
-                  - |2
-                        "logs": {
-                  - |2
-                            "logs_collected": {
-                  - |2
-                                "files": {
-                  - |2
-                                    "collect_list": [
-                  - |2
-                                        {
-                  - |2
-                                            "file_path": "/home/ec2-user/app.log",
-                  - !Join
-                    - ''
-                    - - '                        "log_group_name":'
-                      - '"'
-                      - !Ref InstanceLogGroup
-                      - |
-                        ",
-                  - !Join
-                    - ''
-                    - - '                        "log_stream_name":'
-                      - '"'
-                      - !Ref InstanceLogGroup
-                      - |
-                        -app",
-                  - |2
-                                            "timezone": "Local"
-                  - |2
-                                        }
-                  - |2
-                                    ]
-                  - |2
-                                }
-                  - |2
-                            }
-                  - |2
-                        }
-                  - '}'
-              mode: '000444'
-              group: ec2-user
-              user: ec2-user
-        start-service:
-          commands:
-            0-start-service:
-              command: !Join
-                - ''
-                - - |
-                    sudo systemctl daemon-reload
-                  - |
-                    sudo systemctl enable unishop
-                  - |
-                    sudo systemctl start unishop
-                  - >
-                    sudo amazon-cloudwatch-agent-ctl -a fetch-config -s -m ec2
-                    -c
-                    file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
-    Properties:
-      InstanceType: t3.small
-      ImageId: !Ref LatestAmiId
-      SubnetId: !Ref UniShopAppV1Subnet1
-      SecurityGroupIds:
-        - !Ref EC2SecurityGroup
-      IamInstanceProfile: !Ref S3InstanceProfile
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash
-            - |
-              sudo yum install -y aws-cfn-bootstrap
-            - /opt/aws/bin/cfn-init -v
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource EC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - '         --configsets default '
-            - |+
-
-            - /opt/aws/bin/cfn-signal -e $?
-            - ' --stack '
-            - !Ref 'AWS::StackName'
-            - ' --resource EC2Instance'
-            - ' --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-Outputs:
-  WebsiteURL:
-    Value: !GetAtt UIBucket.WebsiteURL
-    Description: Website URL
\ No newline at end of file
diff --git a/static/Reliability/Disaster_Recovery/Code/WarmStandbyDR.yaml b/static/Reliability/Disaster_Recovery/Code/WarmStandbyDR.yaml
deleted file mode 100644
index 73c89f591..000000000
--- a/static/Reliability/Disaster_Recovery/Code/WarmStandbyDR.yaml
+++ /dev/null
@@ -1,721 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: 'This deployment includes SSM, CloudWatch, and allows instance reboot'
-Parameters:
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
-    Description: 'Use an AMI of your choosing, we recommend to use the latest available'
-  IsPrimary:
-    Type: String
-    Default: 'yes'
-    AllowedValues:
-      - 'yes'
-      - 'no'
-    Description: 'Is primary region'
-  IsPromote:
-    Type: String
-    Default: 'no'
-    AllowedValues:
-      - 'yes'
-      - 'no'
-    Description: 'Promote secondary'
-Conditions:
-  CreatePrimaryDB:
-    !Equals [!Ref IsPrimary, 'yes']
-  CreateSecondaryDB:
-    !Equals [!Ref IsPrimary, 'no']
-  CreateFullApp: !Or
-    - !Equals [!Ref IsPromote, 'yes']
-    - !Condition CreatePrimaryDB
-  EnableWriteFwd: !And
-    - !Not [!Equals [!Ref IsPromote, 'yes']]
-    - !Condition CreateSecondaryDB
-Resources:
-  UniShopAppV1VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      EnableDnsSupport: 'true'
-      EnableDnsHostnames: 'true'
-      InstanceTenancy: default
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-  UniShopAppV1IGW:
-    Type: 'AWS::EC2::InternetGateway'
-    Properties:
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-  AttachGateway:
-    Type: 'AWS::EC2::VPCGatewayAttachment'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      InternetGatewayId: !Ref UniShopAppV1IGW
-  UniShopAppV1Subnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.0.0/24
-      AvailabilityZone: !Select
-        - '0'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-1'
-  UniShopAppV1Subnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      CidrBlock: 10.0.1.0/24
-      AvailabilityZone: !Select
-        - '1'
-        - !GetAZs
-          Ref: 'AWS::Region'
-      MapPublicIpOnLaunch: 'true'
-      Tags:
-        - Key: Name
-          Value: !Sub '${AWS::StackName}-2'
-  UniShopAppV1PublicRoutTable:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref UniShopAppV1VPC
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-  UniShopAppV1PublicRout:
-    Type: 'AWS::EC2::Route'
-    DependsOn: AttachGateway
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      GatewayId: !Ref UniShopAppV1IGW
-      DestinationCidrBlock: 0.0.0.0/0
-  UniShopAppV1PublicSubnetRoutTableAssoc1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet1
-  UniShopAppV1PublicSubnetRoutTableAssoc2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      RouteTableId: !Ref UniShopAppV1PublicRoutTable
-      SubnetId: !Ref UniShopAppV1Subnet2
-  DBSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open database for access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          SourceSecurityGroupId: !Ref EC2SecurityGroup
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-  DBSubnetGroup:
-    Type: 'AWS::RDS::DBSubnetGroup'
-    Properties:
-      DBSubnetGroupDescription: UniShopAppV1DBSubnetGroup
-      SubnetIds:
-        - !Ref UniShopAppV1Subnet1
-        - !Ref UniShopAppV1Subnet2
-  EC2SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Open App access
-      VpcId: !Ref UniShopAppV1VPC
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      SecurityGroupEgress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-        - IpProtocol: tcp
-          FromPort: 443
-          ToPort: 443
-          CidrIp: 0.0.0.0/0
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-  EC2SecurityGroupDBRule:
-    Type: 'AWS::EC2::SecurityGroupEgress'
-    Properties:
-      GroupId: !Ref EC2SecurityGroup
-      IpProtocol: tcp
-      FromPort: 3306
-      ToPort: 3306
-      DestinationSecurityGroupId: !Ref DBSecurityGroup
-  InstanceLogGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: 7
-  S3InstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /
-      Roles:
-        - !Ref S3Role
-  S3Policy:
-    Type: 'AWS::IAM::Policy'
-    Properties:
-      PolicyName: !Sub S3Policy-warm
-      PolicyDocument:
-        Statement:
-          - Effect: Allow
-            Action:
-              - 's3:GetBucketLocation'
-              - 's3:GetObject'
-              - 's3:GetObjectAcl'
-              - 's3:PutObject'
-              - 's3:PutObjectAcl'
-            Resource:
-              - !GetAtt
-                - UIBucket
-                - Arn
-              - !Join
-                - ''
-                - - !GetAtt
-                    - UIBucket
-                    - Arn
-                  - /*
-          - Effect: Allow
-            Action:
-              - 'rds:ModifyDBCluster'
-              - 'rds:Describe*'
-            Resource:
-              - '*'          
-      Roles:
-        - !Ref S3Role
-  S3Role:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName:  !Sub '${AWS::StackName}-${AWS::Region}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore'
-        - 'arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy'
-      Path: /
-  GlobalCluster:
-    Condition: CreatePrimaryDB
-    Type: 'AWS::RDS::GlobalCluster'
-    Properties:
-      GlobalClusterIdentifier: !Sub 'warm-global'
-      SourceDBClusterIdentifier: !Ref RDSClusterPrimary
-  RDSClusterPrimary:
-    Condition: CreatePrimaryDB
-    DeletionPolicy: Retain
-    DependsOn:
-      - DBSubnetGroup
-    Type: 'AWS::RDS::DBCluster'
-    Properties:
-      MasterUsername: UniShopAppV1User
-      MasterUserPassword: UniShopAppV1Password
-      DBClusterIdentifier:  !Ref 'AWS::StackName'
-      Port: 3306
-      DBClusterParameterGroupName: default.aurora-mysql5.7
-      Engine: aurora-mysql
-      EngineVersion: 5.7.mysql_aurora.2.11.1
-      VpcSecurityGroupIds:
-         - !Ref DBSecurityGroup
-      DBSubnetGroupName: !Ref DBSubnetGroup
-      DatabaseName:  unishop
-  RDSClusterSecondary:
-    Condition: CreateSecondaryDB
-    DeletionPolicy: Retain
-    DependsOn:
-      - DBSubnetGroup
-    Type: 'AWS::RDS::DBCluster'
-    Properties:
-      GlobalClusterIdentifier: !Sub 'warm-global'
-      DBClusterIdentifier: !Sub 'warm-secondary'
-      DBClusterParameterGroupName: default.aurora-mysql5.7
-      Engine: aurora-mysql
-      EngineVersion: 5.7.mysql_aurora.2.11.1
-      VpcSecurityGroupIds:
-         - !Ref DBSecurityGroup
-      DBSubnetGroupName: !Ref DBSubnetGroup
-  RDSDBInstance:
-    Type: 'AWS::RDS::DBInstance'
-    DeletionPolicy: Retain
-    Properties:
-      Engine: aurora-mysql
-      DBClusterIdentifier: !If [CreatePrimaryDB, !Ref RDSClusterPrimary, !Ref RDSClusterSecondary]
-      PubliclyAccessible: 'true'
-      DBInstanceClass: db.r5.xlarge
-      DBParameterGroupName: default.aurora-mysql5.7
-      DBInstanceIdentifier: unishop-warm
-  UIBucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      WebsiteConfiguration:
-        ErrorDocument: error.html
-        IndexDocument: index.html
-      PublicAccessBlockConfiguration:
-        BlockPublicAcls: false
-        BlockPublicPolicy: false
-        IgnorePublicAcls: false
-        RestrictPublicBuckets: false         
-  UIBucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref UIBucket
-      PolicyDocument:
-        Statement:
-          -
-            Action:
-              - s3:GetObject
-            Effect: Allow
-            Resource:
-              Fn::Join:
-                - ''
-                - - 'arn:aws:s3:::'
-                  - Ref: 'UIBucket'
-                  - '/*'
-            Principal:
-              AWS:
-                - '*'              
-  WebServerGroup:
-    DependsOn: RDSDBInstance
-    Type: 'AWS::AutoScaling::AutoScalingGroup'
-    Properties:
-      AvailabilityZones:
-        - !Select
-          - '0'
-          - !GetAZs
-            Ref: 'AWS::Region'
-        - !Select
-          - '1'
-          - !GetAZs
-            Ref: 'AWS::Region'
-      Tags:
-        - Key: Name
-          Value:  !Ref 'AWS::StackName'
-          PropagateAtLaunch: true            
-      LaunchConfigurationName: !Ref LaunchConfig
-      MinSize: !If [CreateFullApp, 2, 1]
-      MaxSize: !If [CreateFullApp, 5, 5]
-      LoadBalancerNames:
-        - !Ref ElasticLoadBalancer
-      VPCZoneIdentifier:
-        - !Ref UniShopAppV1Subnet1
-        - !Ref UniShopAppV1Subnet2
-      HealthCheckType: ELB
-      HealthCheckGracePeriod: 60
-    CreationPolicy:
-      ResourceSignal:
-        Timeout: PT10M
-        Count: '1'
-    UpdatePolicy:
-      AutoScalingRollingUpdate:
-        MinInstancesInService: '1'
-        MaxBatchSize: '1'
-        PauseTime: PT15M
-        WaitOnResourceSignals: 'true'
-  LaunchConfig:
-    Type: 'AWS::AutoScaling::LaunchConfiguration'
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          default:
-            - update
-            - install
-            - configure
-            - create-service-files
-            - start-service
-          secondary:
-            - update
-            - install
-            - configure
-            - configure-global-db            
-            - create-service-files
-            - start-service
-        update:
-          commands:
-            update:
-              command: sudo yum update -y
-        install:
-          packages:
-            rpm:
-              'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-            yum:
-              amazon-cloudwatch-agent: []
-              java-1.8.0-openjdk-devel: []
-              mariadb: []
-        configure:
-          commands:
-            0-populate-buckets:
-              command: !Join
-                - ''
-                - - |
-                    #!/bin/bash      
-
-                  - |
-                    sudo mkdir /home/ec2-user/UniShopUI/                              
-                
-                  - export AWS_DEFAULT_REGION=
-                  - !Ref 'AWS::Region'
-                  - |+
-
-                  - export UI_RANDOM_NAME=
-                  - !Ref UIBucket
-                  - |+                                          
-
-                  - export HOSTNAME=
-                  - "http://"
-                  - !GetAtt ElasticLoadBalancer.DNSName
-                  - |+
-
-                  - export JSON_STRING=
-                  - $(echo '{"host":"'"$HOSTNAME"'","region":"'"$AWS_DEFAULT_REGION"'"}')
-                  - |+                                          
-
-                  - |
-                    echo $JSON_STRING | sudo tee /home/ec2-user/UniShopUI/config.json                          
-
-                  - >
-                    aws s3 cp /home/ec2-user/UniShopUI/config.json
-                    s3://$UI_RANDOM_NAME/config.json    
-                    
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopAppV1-0.0.1-SNAPSHOT.jar /home/ec2-user/ --no-sign-request  
-        configure-global-db:
-          commands:
-            1-enable-write-forwarding:
-              command: sudo aws rds modify-db-cluster --db-cluster-identifier warm-secondary --region us-west-1 --enable-global-write-forwarding
-        create-service-files:
-          files:
-            /etc/systemd/system/unishop.service:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    [Unit]
-                  - |
-                    Description=Restart UniShop
-                  - |
-                    Wants=network.target
-                  - >
-                    After=syslog.target network-online.target
-                    amazon-cloudwatch-agent.target
-                  - |+
-
-                  - |
-                    [Service]
-                  - |
-                    Type=forking
-                  - |
-                    ExecStart=/home/ec2-user/unishopstart.sh
-                  - |
-                    ExecReload=/home/ec2-user/unishoprestart.sh
-                  - |
-                    ExecStop=/home/ec2-user/unishopstop.sh
-                  - |                                    
-                    PrivateTmp=true
-                  - |+
-
-                  - |
-                    [Install]
-                  - |
-                    WantedBy=multi-user.target
-              mode: '000644'
-              group: root
-              user: root
-            /home/ec2-user/unishopcfg.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - export DB_ENDPOINT=
-                  - !If [CreatePrimaryDB, !GetAtt RDSClusterPrimary.Endpoint.Address, !If [CreateFullApp, !GetAtt RDSClusterSecondary.Endpoint.Address, !GetAtt RDSClusterSecondary.ReadEndpoint.Address]]
-                  - |+                  
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user
-            /home/ec2-user/unishoprestart.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |                    
-                    source /home/ec2-user/unishopstop.sh
-                  - |
-                    source /home/ec2-user/unishopstart.sh     
-                  - |+
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user
-            /home/ec2-user/unishopstop.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |
-                    APP_NAME=UniShopAppV1-0.0.1-SNAPSHOT.jar                                                                     
-                  - | 
-                    pid=`ps -ef | grep $APP_NAME | grep -v grep | awk '{print $2}'`
-                  - |
-                    if [ -z "${pid}" ]; 
-                  - |
-                    then echo ""
-                  - |
-                    else
-                  - |
-                    echo "kill thread...$pid"
-                  - |
-                    kill -9 $pid                  
-                  - |
-                    fi
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user              
-            /home/ec2-user/unishopstart.sh:
-              encoding: plain
-              content: !Join
-                - ''
-                - - |
-                    #!/bin/bash
-                  - |                    
-                    source /home/ec2-user/unishopcfg.sh   
-                  - >
-                  - java -jar
-                  - ' '
-                  - !If [EnableWriteFwd, '-Dspring.profiles.active=warm ','']
-                  - >
-                    /home/ec2-user/UniShopAppV1-0.0.1-SNAPSHOT.jar
-                    &>
-                    /home/ec2-user/app.log
-                    &
-              mode: '000555'
-              group: ec2-user
-              user: ec2-user              
-            /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json:
-              content: !Join
-                - ''
-                - - |
-                    {
-                  - |2
-                        "logs": {
-                  - |2
-                            "logs_collected": {
-                  - |2
-                                "files": {
-                  - |2
-                                    "collect_list": [
-                  - |2
-                                        {
-                  - |2
-                                            "file_path": "/home/ec2-user/app.log",
-                  - !Join
-                    - ''
-                    - - '                        "log_group_name":'
-                      - '"'
-                      - !Ref InstanceLogGroup
-                      - |
-                        ",
-                  - !Join
-                    - ''
-                    - - '                        "log_stream_name":'
-                      - '"'
-                      - !Ref InstanceLogGroup
-                      - |
-                        -app",
-                  - |2
-                                            "timezone": "Local"
-                  - |2
-                                        }
-                  - |2
-                                    ]
-                  - |2
-                                }
-                  - |2
-                            }
-                  - |2
-                        }
-                  - '}'
-              mode: '000444'
-              group: ec2-user
-              user: ec2-user
-        start-service:
-          commands:
-            0-start-service:
-              command: !Join
-                - ''
-                - - |
-                    sudo systemctl daemon-reload
-                  - |
-                    sudo systemctl enable unishop
-                  - |
-                    sudo systemctl start unishop
-                  - >
-                    sudo amazon-cloudwatch-agent-ctl -a fetch-config -s -m ec2
-                    -c
-                    file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
-    Properties:
-      InstanceType: t3.small
-      ImageId: !Ref LatestAmiId
-      SecurityGroups:
-        - !Ref EC2SecurityGroup
-      IamInstanceProfile: !Ref S3InstanceProfile
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash
-            - |
-              sudo yum install -y aws-cfn-bootstrap
-            - /opt/aws/bin/cfn-init -v
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource LaunchConfig '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - !If [CreatePrimaryDB, '         --configsets default','         --configsets secondary']
-            - |+
-
-            - /opt/aws/bin/cfn-signal -e $?
-            - ' --stack '
-            - !Ref 'AWS::StackName'
-            - ' --resource WebServerGroup'
-            - ' --region '
-            - !Ref 'AWS::Region'
-            - |+
-            
-  ElasticLoadBalancer:
-    DependsOn: AttachGateway
-    Type: 'AWS::ElasticLoadBalancing::LoadBalancer'
-    Properties:
-      CrossZone: 'true'
-      SecurityGroups:
-        - !Ref EC2SecurityGroup
-      Subnets:
-        - !Ref UniShopAppV1Subnet1
-        - !Ref UniShopAppV1Subnet2
-      Listeners:
-        - LoadBalancerPort: '80'
-          InstancePort: '80'
-          Protocol: HTTP
-      HealthCheck:
-        Target: 'TCP:80'
-        HealthyThreshold: '3'
-        UnhealthyThreshold: '5'
-        Interval: '30'
-        Timeout: '5'
-  EC2Instance:
-    Type: 'AWS::EC2::Instance'
-    DependsOn: RDSDBInstance
-    CreationPolicy:
-      ResourceSignal:
-        Count: 1
-        Timeout: PT10M
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          default:
-            - update
-            - install
-            - configure
-            - create-tables
-          secondary:
-            - update
-            - install
-            - configure
-        update:
-          commands:
-            update:
-              command: sudo yum update -y
-        install:
-          packages:
-            rpm:
-              'https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm': []
-            yum:
-              amazon-cloudwatch-agent: []
-              mariadb: []
-              java-1.8.0-openjdk-devel: []
-        configure:
-          commands:
-            0-populate-buckets:
-              command: !Join
-                - ''
-                - - |
-                    #!/bin/bash      
-                  - |
-                    sudo mkdir /home/ec2-user/UniShopUI/                                            
-                  - >
-                    sudo aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/create_tables.sql /home/ec2-user/ --no-sign-request    
-                  - >
-                  - export UI_RANDOM_NAME=
-                  - !Ref UIBucket
-                  - |+       
-
-                    aws s3 cp s3://ee-assets-prod-us-east-1/modules/630039b9022d4b46bb6cbad2e3899733/v1/UniShopUI/ /home/ec2-user/UniShopUI/ --no-sign-request --recursive                                           
-                  - >
-                    aws s3 cp /home/ec2-user/UniShopUI/ s3://$UI_RANDOM_NAME/ --exclude "config.json" --recursive 
-        create-tables:
-          commands:
-            1-create-tables:
-              command: !Join
-                - ''
-                - - 'sudo mysql -u UniShopAppV1User -h '
-                  - !If [CreatePrimaryDB, !GetAtt RDSClusterPrimary.Endpoint.Address, !GetAtt RDSClusterSecondary.ReadEndpoint.Address]
-                  - |2
-                     -P 3306 -pUniShopAppV1Password < /home/ec2-user/create_tables.sql
-    Properties:
-      InstanceType: t3.small
-      ImageId: !Ref LatestAmiId
-      SubnetId: !Ref UniShopAppV1Subnet1
-      SecurityGroupIds:
-        - !Ref EC2SecurityGroup
-      IamInstanceProfile: !Ref S3InstanceProfile
-      UserData: !Base64
-        'Fn::Join':
-          - ''
-          - - |
-              #!/bin/bash
-            - |
-              sudo yum install -y aws-cfn-bootstrap
-            - /opt/aws/bin/cfn-init -v
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource EC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - !If [CreatePrimaryDB, '         --configsets default','         --configsets secondary']
-            - |+
-
-            - /opt/aws/bin/cfn-signal -e $?
-            - ' --stack '
-            - !Ref 'AWS::StackName'
-            - ' --resource EC2Instance'
-            - ' --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-      Tags:
-        - Key: Name
-          Value:  !Sub '${AWS::StackName}-build'
-Outputs:
-  WebsiteURL:
-    Value: !GetAtt UIBucket.WebsiteURL
-    Description: Website URL
diff --git a/static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty-securityhub.yaml b/static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty-securityhub.yaml
deleted file mode 100644
index e971d6c7a..000000000
--- a/static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty-securityhub.yaml
+++ /dev/null
@@ -1,629 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for enabling CloudTrail, Config and GuardDuty. 
-  **WARNING** You will be billed for the AWS resources created if you create a 
-  stack from this template.
-
-  Copyright 2019-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-Parameters:
-  #General
-  Config:
-    Type: String
-    Description: 'Configure AWS Config. If you have previously enabled Config select No.'
-    Default: 'Yes'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  GuardDuty:
-    Type: String
-    Description: 'Configure Amazon GuardDuty. If you have previously enabled GuardDuty select No.'
-    Default: 'Yes'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  SecurityHub:
-    Type: String
-    Description: 'Configure AWS Security Hub. AWS Config must be enabled in this stack for Security Hub to work.'
-    Default: 'Yes'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  S3BucketPolicyExplicitDeny:
-    Type: String
-    Description: 'Optional: Explicitly deny destructive actions to buckets created in this stack. Note: you will need to login as root to remove the bucket policy'
-    Default: 'No'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  S3AccessLogsBucketName:
-    Type: String
-    Description: 'Optional: The name of an existing S3 bucket for storing S3 Access Logs. Leave blank for no S3 access logs.'
-    Default: ''
-  #CloudTrail
-  CloudTrailBucketName:
-    Type: String
-    Description: The name of the new S3 bucket to create for CloudTrail to send logs to. Can contain only lower-case characters, numbers, periods, and dashes.Each label in the bucket name must start with a lowercase letter or number.
-    MinLength: '3'
-    MaxLength: '63'
-    AllowedPattern: '([a-zA-Z0-9]){1}([a-zA-Z0-9-])*'
-  CloudTrailCWLogsRetentionTime:
-    Type: Number
-    Description: 'Number of days to retain logs in CloudWatch Logs. 0=Forever. Default 1 year, note logs are stored in S3 default 10 years'
-    Default: '365'
-  CloudTrailS3RetentionTime:
-    Type: Number
-    Description: Number of days to retain logs in the S3 Bucket before they are automatically deleted. Default is ~ 10 years
-    Default: '3650'
-  CloudTrailEncryptS3Logs:
-    Type: String
-    Description: 'OPTIONAL: Use KMS to enrypt logs stored in S3. A new key will be created'
-    Default: 'No'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  CloudTrailLogS3DataEvents:
-    Type: String
-    Description: 'OPTIONAL: These events provide insight into the resource operations performed on or within S3'
-    Default: 'No'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  #Config
-  ConfigBucketName:
-    Type: String
-    Description: >-
-      The name of the S3 bucket Config Service will store configuration
-      snapshots in. Each label in the bucket name must start with a lowercase letter or number.
-  ConfigSnapshotFrequency:
-    Type: String
-    Description: AWS Config configuration snapshot frequency
-    Default: One_Hour
-    AllowedValues:
-      - One_Hour
-      - Three_Hours
-      - Six_Hours
-      - Twelve_Hours
-      - TwentyFour_Hours
-  ConfigS3RetentionTime:
-    Type: Number
-    Description: Number of days to retain logs in the S3 Bucket before they are automatically deleted. Default is ~ 10 years
-    Default: '3650'
-  #GuardDuty
-  GuardDutyEmailAddress:
-    Type: String
-    Default: 'someone@example.com'
-    Description: Enter the email address that will receive the alerts
-
-Conditions:
-  ConfigEnabled: !Equals
-    - !Ref Config
-    - 'Yes'
-  GuardDutyEnabled: !Equals
-    - !Ref GuardDuty
-    - 'Yes'
-  SecurityHubEnabled: !Equals
-    - !Ref SecurityHub
-    - 'Yes'
-  S3BucketExplicitDenyEnabled: !Equals 
-    - !Ref S3BucketPolicyExplicitDeny
-    - 'Yes'
-  CloudTrailEncryptS3LogsEnabled: !Equals
-    - !Ref CloudTrailEncryptS3Logs
-    - 'Yes'
-  BucketLoggingEnabled: !Not 
-    - !Equals 
-      - !Ref S3AccessLogsBucketName
-      - ''
-  CloudTrailLogS3DataEventsEnabled: !Equals
-    - !Ref CloudTrailLogS3DataEvents
-    - 'Yes'
-
-Metadata:
-  'AWS::CloudFormation::Interface':
-    ParameterGroups:
-      - Label:
-          default: General
-        Parameters:
-          - CloudTrail
-          - Config
-          - GuardDuty
-          - SecurityHub
-          - S3BucketPolicyExplicitDeny
-          - S3AccessLogsBucketName
-      - Label:
-          default: CloudTrail
-        Parameters:  
-          - CloudTrailBucketName
-          - CloudTrailCWLogsRetentionTime
-          - CloudTrailS3RetentionTime
-          - CloudTrailEncryptS3Logs
-          - CloudTrailLogS3DataEvents
-      - Label:
-          default: Config
-        Parameters:    
-          - ConfigBucketName
-          - ConfigSnapshotFrequency
-          - ConfigS3RetentionTime
-      - Label:
-          default: GuardDuty
-        Parameters:    
-          - GuardDutyEmailAddress
-
-Resources:
-  #CloudTrail
-  CloudTrailKMSKey:
-    Type: 'AWS::KMS::Key'
-    DeletionPolicy: Delete
-    Condition: CloudTrailEncryptS3LogsEnabled
-    Properties:
-      Description: KMS Key for Cloudtrail to use to encrypt logs stored in S3
-      KeyPolicy:
-        Version: 2012-10-17
-        Id: Key policy created by CloudTrail
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS:
-                - !Join 
-                  - ''
-                  - - 'arn:aws:iam::'
-                    - !Ref 'AWS::AccountId'
-                    - ':root'
-            Action: 'kms:*'
-            Resource: '*'
-          - Sid: Allow CloudTrail to encrypt logs
-            Effect: Allow
-            Principal:
-              Service:
-                - cloudtrail.amazonaws.com
-            Action: 'kms:GenerateDataKey*'
-            Resource: '*'
-            Condition:
-              StringLike:
-                'kms:EncryptionContext:aws:cloudtrail:arn': !Join 
-                  - ''
-                  - - 'arn:aws:cloudtrail:*:'
-                    - !Ref 'AWS::AccountId'
-                    - ':trail/*'
-          - Sid: Allow CloudTrail to describe key
-            Effect: Allow
-            Principal:
-              Service:
-                - cloudtrail.amazonaws.com
-            Action: 'kms:DescribeKey'
-            Resource: '*'
-          - Sid: Allow principals in the account to decrypt log files
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action:
-              - 'kms:Decrypt'
-              - 'kms:ReEncryptFrom'
-            Resource: '*'
-            Condition:
-              StringEquals:
-                'kms:CallerAccount': !Ref 'AWS::AccountId'
-              StringLike:
-                'kms:EncryptionContext:aws:cloudtrail:arn': !Join 
-                  - ''
-                  - - 'arn:aws:cloudtrail:*:'
-                    - !Ref 'AWS::AccountId'
-                    - ':trail/*'
-          - Sid: Allow alias creation during setup
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action: 'kms:CreateAlias'
-            Resource: '*'
-            Condition:
-              StringEquals:
-                'kms:ViaService': !Join 
-                  - ''
-                  - - ec2.
-                    - !Ref 'AWS::Region'
-                    - .amazonaws.com
-                'kms:CallerAccount': !Ref 'AWS::AccountId'
-          - Sid: Enable cross account log decryption
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action:
-              - 'kms:Decrypt'
-              - 'kms:ReEncryptFrom'
-            Resource: '*'
-            Condition:
-              StringEquals:
-                'kms:CallerAccount': !Ref 'AWS::AccountId'
-              StringLike:
-                'kms:EncryptionContext:aws:cloudtrail:arn': !Join 
-                  - ''
-                  - - 'arn:aws:cloudtrail:*:'
-                    - !Ref 'AWS::AccountId'
-                    - ':trail/*'
-  CloudTrailDestinationBucket:
-    Type: 'AWS::S3::Bucket'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
-    Properties:
-      BucketName: !Ref CloudTrailBucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      LoggingConfiguration: !If 
-        - BucketLoggingEnabled
-        - DestinationBucketName: !Ref S3AccessLogsBucketName
-          LogFilePrefix: !Join 
-            - ''
-            - - !Ref CloudTrailBucketName
-              - /
-        - !Ref 'AWS::NoValue'
-      VersioningConfiguration:
-        Status: Enabled
-      LifecycleConfiguration:
-        Rules:
-          - Id: Delete
-            Status: Enabled
-            ExpirationInDays: !Ref CloudTrailS3RetentionTime
-    DeletionPolicy: Delete
-  CloudTrailBucketPolicy:
-    Type: 'AWS::S3::BucketPolicy'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
-    DependsOn:
-      - CloudTrailDestinationBucket
-    Properties:
-      Bucket: !Ref CloudTrailDestinationBucket
-      PolicyDocument:
-        Id: CloudTrailService
-        Statement:
-          - !If 
-            - S3BucketExplicitDenyEnabled
-            - Action:
-                - 's3:DeleteBucket'
-                - 's3:DeleteBucketPolicy'
-                - 's3:DeleteBucketWebsite'
-                - 's3:DeleteObject'
-                - 's3:DeleteObjectVersion'
-                - 's3:PutAccelerateConfiguration'
-                - 's3:PutBucketAcl'
-                - 's3:PutBucketCORS'
-                - 's3:PutBucketLogging'
-                - 's3:PutBucketPolicy'
-                - 's3:PutBucketRequestPayment'
-                - 's3:PutBucketVersioning'
-                - 's3:PutBucketWebsite'
-                - 's3:PutLifecycleConfiguration'
-                - 's3:PutReplicationConfiguration'
-                - 's3:ReplicateDelete'
-                - 's3:ReplicateObject'
-                - 's3:RestoreObject'
-              Effect: Deny
-              Principal: '*'
-              Resource:
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref CloudTrailDestinationBucket
-                    - /*
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref CloudTrailDestinationBucket
-              Sid: DenyDestructiveActions
-            - !Ref 'AWS::NoValue'
-          - Action:
-              - 's3:GetBucketAcl'
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Effect: Allow
-            Resource:
-              - !Join 
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref CloudTrailDestinationBucket
-            Sid: AllowCloudTrailServiceGetAcl
-          - Action:
-              - 's3:PutObject'
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Effect: Allow
-            Condition:
-              StringEquals:
-                's3:x-amz-acl': bucket-owner-full-control
-            Resource:
-              - !Join 
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref CloudTrailDestinationBucket
-                  - /*
-            Sid: AllowCloudTrailServicePut
-          - Action:
-             - 's3:PutObject'
-            Principal: 
-              AWS: 
-                - '981588356137'
-                - '129689185312'
-            Effect: Allow
-            Resource:
-             - !Join
-               - ''
-               - - 'arn:aws:s3:::'
-                 - !Ref CloudTrailDestinationBucket
-                 - /*
-            Sid: AllowManagedAccountsCloudtrail
-        Version: 2012-10-17
-  CloudTrailDestinationTrail:
-    Type: 'AWS::CloudTrail::Trail'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html
-    DependsOn:
-      - CloudTrailBucketPolicy
-      - CloudTrailCWLogsGroup
-      - CloudTrailCloudWatchLogsRole
-    Properties:
-      TrailName: default
-      S3BucketName: !Ref CloudTrailDestinationBucket
-      #S3KeyPrefix:
-      CloudWatchLogsLogGroupArn: !Sub '${CloudTrailCWLogsGroup.Arn}'
-      CloudWatchLogsRoleArn: !Sub '${CloudTrailCloudWatchLogsRole.Arn}'
-      #CloudWatchLogsRoleArn: !Sub 'arn:aws:iam::${AWS::AccountId}:role/aws-service-role/cloudtrail.amazonaws.com/AWSServiceRoleForCloudTrail'
-      EnableLogFileValidation: true
-      EventSelectors: #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html
-        - IncludeManagementEvents: true
-        - ReadWriteType: All
-        - !If 
-          - CloudTrailLogS3DataEventsEnabled
-          - DataResources:
-            - Type: AWS::S3::Object
-              Values:
-                - "arn:aws:s3:::"
-          - !Ref 'AWS::NoValue'
-      IncludeGlobalServiceEvents: true
-      IsMultiRegionTrail: true
-      IsLogging: true
-      KMSKeyId: !If 
-        - CloudTrailEncryptS3LogsEnabled
-        - !Ref CloudTrailKMSKey
-        - !Ref 'AWS::NoValue'
-  CloudTrailCWLogsGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: !Ref CloudTrailCWLogsRetentionTime
-  CloudTrailCloudWatchLogsRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn:
-      - CloudTrailCWLogsGroup
-    Properties:
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - 'sts:AssumeRole'
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-        Version: 2012-10-17
-      Policies:
-        - PolicyDocument:
-            Statement:
-              - Action:
-                  - 'logs:CreateLogStream'
-                Effect: Allow
-                Resource: !Sub '${CloudTrailCWLogsGroup.Arn}'
-              - Action:
-                  - 'logs:PutLogEvents'
-                Effect: Allow
-                Resource: !Sub '${CloudTrailCWLogsGroup.Arn}'
-            Version: 2012-10-17
-          PolicyName: CloudtrailInteractionPolicy
-  #Config
-  ConfigRole:
-    Type: 'AWS::IAM::Role'
-    Condition: ConfigEnabled
-    Properties:
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - 'sts:AssumeRole'
-            Effect: Allow
-            Principal:
-              Service: config.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AWS_ConfigRole'
-      Path: /service-role/
-      Policies:
-        - PolicyDocument:
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 's3:PutObject'
-                Resource: !Sub 'arn:aws:s3:::${ConfigBucket}/*'
-              - Effect: Allow
-                Action:
-                  - 's3:GetBucketAcl'
-                Resource: !Sub 'arn:aws:s3:::${ConfigBucket}'
-            Version: 2012-10-17
-          PolicyName: ConfigServiceS3
-  ConfigDeliveryChannel:
-    Type: 'AWS::Config::DeliveryChannel'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html
-    Condition: ConfigEnabled
-    Properties:
-      Name: default
-      ConfigSnapshotDeliveryProperties:
-        DeliveryFrequency: !Ref ConfigSnapshotFrequency
-      S3BucketName: !Ref ConfigBucket
-  ConfigRecorder:
-    Type: 'AWS::Config::ConfigurationRecorder'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html
-    Condition: ConfigEnabled
-    Properties:
-      Name: default
-      RecordingGroup:
-        AllSupported: 'true'
-        IncludeGlobalResourceTypes: 'true'
-      RoleARN: !Sub '${ConfigRole.Arn}'
-  ConfigBucket:
-    Type: 'AWS::S3::Bucket'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
-    Condition: ConfigEnabled
-    Properties:
-      BucketName: !Ref ConfigBucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      LoggingConfiguration: !If 
-        - BucketLoggingEnabled
-        - DestinationBucketName: !Ref S3AccessLogsBucketName
-          LogFilePrefix: !Join 
-            - ''
-            - - !Ref ConfigBucketName
-              - /
-        - !Ref 'AWS::NoValue'
-      VersioningConfiguration:
-        Status: Enabled
-      LifecycleConfiguration:
-        Rules:
-          - Id: Delete
-            Status: Enabled
-            ExpirationInDays: !Ref ConfigS3RetentionTime
-    DeletionPolicy: Delete
-  ConfigBucketPolicy:
-    Type: 'AWS::S3::BucketPolicy'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
-    Condition: ConfigEnabled
-    DependsOn:
-      - ConfigBucket
-    Properties:
-      Bucket: !Ref ConfigBucket
-      PolicyDocument:
-        Id: ConfigService
-        Statement:
-          - !If 
-            - S3BucketExplicitDenyEnabled
-            - Action:
-                - 's3:DeleteBucket'
-                - 's3:DeleteBucketPolicy'
-                - 's3:DeleteBucketWebsite'
-                - 's3:DeleteObject'
-                - 's3:DeleteObjectVersion'
-                - 's3:PutAccelerateConfiguration'
-                - 's3:PutBucketAcl'
-                - 's3:PutBucketCORS'
-                - 's3:PutBucketLogging'
-                - 's3:PutBucketPolicy'
-                - 's3:PutBucketRequestPayment'
-                - 's3:PutBucketVersioning'
-                - 's3:PutBucketWebsite'
-                - 's3:PutLifecycleConfiguration'
-                - 's3:PutReplicationConfiguration'
-                - 's3:ReplicateDelete'
-                - 's3:ReplicateObject'
-                - 's3:RestoreObject'
-              Effect: Deny
-              Principal: '*'
-              Resource:
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref ConfigBucket
-                    - /*
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref ConfigBucket
-              Sid: DenyDestructiveActions
-            - !Ref 'AWS::NoValue'
-          - Action: 's3:GetBucketAcl'
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Resource: !Join 
-              - ''
-              - - 'arn:aws:s3:::'
-                - !Ref ConfigBucket
-            Sid: ConfigServiceACLCheck
-          - Action: 's3:PutObject'
-            Condition:
-              StringEquals:
-                's3:x-amz-acl': bucket-owner-full-control
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Resource:
-              - !Join 
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref ConfigBucket
-                  - /*
-            Sid: ConfigServiceWrite
-        Version: 2012-10-17
-  #GuardDuty
-  GuardDutyDetector:
-    Type: 'AWS::GuardDuty::Detector'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html
-    Condition: GuardDutyEnabled
-    Properties:
-      Enable: true
-      FindingPublishingFrequency: FIFTEEN_MINUTES
-  GuardDutySNSTopic:
-    Type: 'AWS::SNS::Topic'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html
-    Condition: GuardDutyEnabled
-    Properties:
-      TopicName: GuardDuty-Email
-  GuardDutyCWEvent:
-    Type: 'AWS::Events::Rule'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html
-    Condition: GuardDutyEnabled
-    Properties:
-      Description: GuardDuty Email Event
-      EventPattern:
-        source:
-          - aws.guardduty
-        detail-type:
-          - GuardDuty Finding
-      State: ENABLED
-      Targets:
-        - Arn: !Ref GuardDutySNSTopic
-          Id: GuardDuty-Email
-  GuardDutySNSSubscription:
-    Type: 'AWS::SNS::Subscription'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html
-    Condition: GuardDutyEnabled
-    Properties:
-      Endpoint: !Ref GuardDutyEmailAddress
-      Protocol: email
-      TopicArn: !Ref GuardDutySNSTopic
-  #SecurityHub
-  SecurityHubSingleAcc:
-    Type: 'AWS::SecurityHub::Hub'
-    Condition: SecurityHubEnabled
-    DependsOn: ConfigRecorder
-Outputs:
-  CloudTrailBucketName:
-    Description: S3 bucket for CloudTrail logs
-    Value: !Ref CloudTrailDestinationBucket
-    Export:
-      Name: !Sub '${AWS::StackName}-CloudTrailBucketName'
diff --git a/static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty.yaml b/static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty.yaml
deleted file mode 100644
index aba0956a4..000000000
--- a/static/Security/200_Automated_Deployment_of_Detective_Controls/Code/cloudtrail-config-guardduty.yaml
+++ /dev/null
@@ -1,614 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for enabling CloudTrail, Config and GuardDuty. 
-  **WARNING** You will be billed for the AWS resources created if you create a 
-  stack from this template.
-
-  Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-Parameters:
-  #General
-  Config:
-    Type: String
-    Description: 'Configure AWS Config. If you have previously enabled Config select No.'
-    Default: 'Yes'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  GuardDuty:
-    Type: String
-    Description: 'Configure Amazon GuardDuty. If you have previously enabled GuardDuty select No.'
-    Default: 'Yes'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  S3BucketPolicyExplicitDeny:
-    Type: String
-    Description: 'Optional: Explicitly deny destructive actions to buckets created in this stack. Note: you will need to login as root to remove the bucket policy'
-    Default: 'No'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  S3AccessLogsBucketName:
-    Type: String
-    Description: 'Optional: The name of an existing S3 bucket for storing S3 Access Logs. Leave blank for no S3 access logs.'
-    Default: ''
-  #CloudTrail
-  CloudTrailBucketName:
-    Type: String
-    Description: The name of the new S3 bucket to create for CloudTrail to send logs to. Can contain only lower-case characters, numbers, periods, and dashes.Each label in the bucket name must start with a lowercase letter or number.
-    MinLength: '3'
-    MaxLength: '63'
-    AllowedPattern: '([a-zA-Z0-9]){1}([a-zA-Z0-9-])*'
-  CloudTrailCWLogsRetentionTime:
-    Type: Number
-    Description: 'Number of days to retain logs in CloudWatch Logs. 0=Forever. Default 1 year, note logs are stored in S3 default 10 years'
-    Default: '365'
-  CloudTrailS3RetentionTime:
-    Type: Number
-    Description: Number of days to retain logs in the S3 Bucket before they are automatically deleted. Default is ~ 10 years
-    Default: '3650'
-  CloudTrailEncryptS3Logs:
-    Type: String
-    Description: 'OPTIONAL: Use KMS to enrypt logs stored in S3. A new key will be created'
-    Default: 'No'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  CloudTrailLogS3DataEvents:
-    Type: String
-    Description: 'OPTIONAL: These events provide insight into the resource operations performed on or within S3'
-    Default: 'No'
-    AllowedValues:
-      - 'No'
-      - 'Yes'
-  #Config
-  ConfigBucketName:
-    Type: String
-    Description: >-
-      The name of the S3 bucket Config Service will store configuration
-      snapshots in. Each label in the bucket name must start with a lowercase letter or number.
-  ConfigSnapshotFrequency:
-    Type: String
-    Description: AWS Config configuration snapshot frequency
-    Default: One_Hour
-    AllowedValues:
-      - One_Hour
-      - Three_Hours
-      - Six_Hours
-      - Twelve_Hours
-      - TwentyFour_Hours
-  ConfigS3RetentionTime:
-    Type: Number
-    Description: Number of days to retain logs in the S3 Bucket before they are automatically deleted. Default is ~ 10 years
-    Default: '3650'
-  #GuardDuty
-  GuardDutyEmailAddress:
-    Type: String
-    Default: 'someone@example.com'
-    Description: Enter the email address that will receive the alerts
-
-Conditions:
-  ConfigEnabled: !Equals
-    - !Ref Config
-    - 'Yes'
-  GuardDutyEnabled: !Equals
-    - !Ref GuardDuty
-    - 'Yes'
-  S3BucketExplicitDenyEnabled: !Equals 
-    - !Ref S3BucketPolicyExplicitDeny
-    - 'Yes'
-  CloudTrailEncryptS3LogsEnabled: !Equals
-    - !Ref CloudTrailEncryptS3Logs
-    - 'Yes'
-  BucketLoggingEnabled: !Not 
-    - !Equals 
-      - !Ref S3AccessLogsBucketName
-      - ''
-  CloudTrailLogS3DataEventsEnabled: !Equals
-    - !Ref CloudTrailLogS3DataEvents
-    - 'Yes'
-
-Metadata:
-  'AWS::CloudFormation::Interface':
-    ParameterGroups:
-      - Label:
-          default: General
-        Parameters:
-          - CloudTrail
-          - Config
-          - GuardDuty
-          - S3BucketPolicyExplicitDeny
-          - S3AccessLogsBucketName
-      - Label:
-          default: CloudTrail
-        Parameters:  
-          - CloudTrailBucketName
-          - CloudTrailCWLogsRetentionTime
-          - CloudTrailS3RetentionTime
-          - CloudTrailEncryptS3Logs
-          - CloudTrailLogS3DataEvents
-      - Label:
-          default: Config
-        Parameters:    
-          - ConfigBucketName
-          - ConfigSnapshotFrequency
-          - ConfigS3RetentionTime
-      - Label:
-          default: GuardDuty
-        Parameters:    
-          - GuardDutyEmailAddress
-
-Resources:
-  #CloudTrail
-  CloudTrailKMSKey:
-    Type: 'AWS::KMS::Key'
-    DeletionPolicy: Delete
-    Condition: CloudTrailEncryptS3LogsEnabled
-    Properties:
-      Description: KMS Key for Cloudtrail to use to encrypt logs stored in S3
-      KeyPolicy:
-        Version: 2012-10-17
-        Id: Key policy created by CloudTrail
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS:
-                - !Join 
-                  - ''
-                  - - 'arn:aws:iam::'
-                    - !Ref 'AWS::AccountId'
-                    - ':root'
-            Action: 'kms:*'
-            Resource: '*'
-          - Sid: Allow CloudTrail to encrypt logs
-            Effect: Allow
-            Principal:
-              Service:
-                - cloudtrail.amazonaws.com
-            Action: 'kms:GenerateDataKey*'
-            Resource: '*'
-            Condition:
-              StringLike:
-                'kms:EncryptionContext:aws:cloudtrail:arn': !Join 
-                  - ''
-                  - - 'arn:aws:cloudtrail:*:'
-                    - !Ref 'AWS::AccountId'
-                    - ':trail/*'
-          - Sid: Allow CloudTrail to describe key
-            Effect: Allow
-            Principal:
-              Service:
-                - cloudtrail.amazonaws.com
-            Action: 'kms:DescribeKey'
-            Resource: '*'
-          - Sid: Allow principals in the account to decrypt log files
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action:
-              - 'kms:Decrypt'
-              - 'kms:ReEncryptFrom'
-            Resource: '*'
-            Condition:
-              StringEquals:
-                'kms:CallerAccount': !Ref 'AWS::AccountId'
-              StringLike:
-                'kms:EncryptionContext:aws:cloudtrail:arn': !Join 
-                  - ''
-                  - - 'arn:aws:cloudtrail:*:'
-                    - !Ref 'AWS::AccountId'
-                    - ':trail/*'
-          - Sid: Allow alias creation during setup
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action: 'kms:CreateAlias'
-            Resource: '*'
-            Condition:
-              StringEquals:
-                'kms:ViaService': !Join 
-                  - ''
-                  - - ec2.
-                    - !Ref 'AWS::Region'
-                    - .amazonaws.com
-                'kms:CallerAccount': !Ref 'AWS::AccountId'
-          - Sid: Enable cross account log decryption
-            Effect: Allow
-            Principal:
-              AWS: '*'
-            Action:
-              - 'kms:Decrypt'
-              - 'kms:ReEncryptFrom'
-            Resource: '*'
-            Condition:
-              StringEquals:
-                'kms:CallerAccount': !Ref 'AWS::AccountId'
-              StringLike:
-                'kms:EncryptionContext:aws:cloudtrail:arn': !Join 
-                  - ''
-                  - - 'arn:aws:cloudtrail:*:'
-                    - !Ref 'AWS::AccountId'
-                    - ':trail/*'
-  CloudTrailDestinationBucket:
-    Type: 'AWS::S3::Bucket'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
-    Properties:
-      BucketName: !Ref CloudTrailBucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      LoggingConfiguration: !If 
-        - BucketLoggingEnabled
-        - DestinationBucketName: !Ref S3AccessLogsBucketName
-          LogFilePrefix: !Join 
-            - ''
-            - - !Ref CloudTrailBucketName
-              - /
-        - !Ref 'AWS::NoValue'
-      VersioningConfiguration:
-        Status: Enabled
-      LifecycleConfiguration:
-        Rules:
-          - Id: Delete
-            Status: Enabled
-            ExpirationInDays: !Ref CloudTrailS3RetentionTime
-    DeletionPolicy: Delete
-  CloudTrailBucketPolicy:
-    Type: 'AWS::S3::BucketPolicy'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
-    DependsOn:
-      - CloudTrailDestinationBucket
-    Properties:
-      Bucket: !Ref CloudTrailDestinationBucket
-      PolicyDocument:
-        Id: CloudTrailService
-        Statement:
-          - !If 
-            - S3BucketExplicitDenyEnabled
-            - Action:
-                - 's3:DeleteBucket'
-                - 's3:DeleteBucketPolicy'
-                - 's3:DeleteBucketWebsite'
-                - 's3:DeleteObject'
-                - 's3:DeleteObjectVersion'
-                - 's3:PutAccelerateConfiguration'
-                - 's3:PutBucketAcl'
-                - 's3:PutBucketCORS'
-                - 's3:PutBucketLogging'
-                - 's3:PutBucketPolicy'
-                - 's3:PutBucketRequestPayment'
-                - 's3:PutBucketVersioning'
-                - 's3:PutBucketWebsite'
-                - 's3:PutLifecycleConfiguration'
-                - 's3:PutReplicationConfiguration'
-                - 's3:ReplicateDelete'
-                - 's3:ReplicateObject'
-                - 's3:RestoreObject'
-              Effect: Deny
-              Principal: '*'
-              Resource:
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref CloudTrailDestinationBucket
-                    - /*
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref CloudTrailDestinationBucket
-              Sid: DenyDestructiveActions
-            - !Ref 'AWS::NoValue'
-          - Action:
-              - 's3:GetBucketAcl'
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Effect: Allow
-            Resource:
-              - !Join 
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref CloudTrailDestinationBucket
-            Sid: AllowCloudTrailServiceGetAcl
-          - Action:
-              - 's3:PutObject'
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Effect: Allow
-            Condition:
-              StringEquals:
-                's3:x-amz-acl': bucket-owner-full-control
-            Resource:
-              - !Join 
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref CloudTrailDestinationBucket
-                  - /*
-            Sid: AllowCloudTrailServicePut
-          - Action:
-             - 's3:PutObject'
-            Principal: 
-              AWS: 
-                - '981588356137'
-                - '129689185312'
-            Effect: Allow
-            Resource:
-             - !Join
-               - ''
-               - - 'arn:aws:s3:::'
-                 - !Ref CloudTrailDestinationBucket
-                 - /*
-            Sid: AllowManagedAccountsCloudtrail
-        Version: 2012-10-17
-  CloudTrailDestinationTrail:
-    Type: 'AWS::CloudTrail::Trail'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html
-    DependsOn:
-      - CloudTrailBucketPolicy
-      - CloudTrailCWLogsGroup
-      - CloudTrailCloudWatchLogsRole
-    Properties:
-      TrailName: default
-      S3BucketName: !Ref CloudTrailDestinationBucket
-      #S3KeyPrefix:
-      CloudWatchLogsLogGroupArn: !Sub '${CloudTrailCWLogsGroup.Arn}'
-      CloudWatchLogsRoleArn: !Sub '${CloudTrailCloudWatchLogsRole.Arn}'
-      #CloudWatchLogsRoleArn: !Sub 'arn:aws:iam::${AWS::AccountId}:role/aws-service-role/cloudtrail.amazonaws.com/AWSServiceRoleForCloudTrail'
-      EnableLogFileValidation: true
-      EventSelectors: #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html
-        - IncludeManagementEvents: true
-        - ReadWriteType: All
-        - !If 
-          - CloudTrailLogS3DataEventsEnabled
-          - DataResources:
-            - Type: AWS::S3::Object
-              Values:
-                - "arn:aws:s3:::"
-          - !Ref 'AWS::NoValue'
-      IncludeGlobalServiceEvents: true
-      IsMultiRegionTrail: true
-      IsLogging: true
-      KMSKeyId: !If 
-        - CloudTrailEncryptS3LogsEnabled
-        - !Ref CloudTrailKMSKey
-        - !Ref 'AWS::NoValue'
-  CloudTrailCWLogsGroup:
-    Type: 'AWS::Logs::LogGroup'
-    Properties:
-      RetentionInDays: !Ref CloudTrailCWLogsRetentionTime
-  CloudTrailCloudWatchLogsRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn:
-      - CloudTrailCWLogsGroup
-    Properties:
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - 'sts:AssumeRole'
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-        Version: 2012-10-17
-      Policies:
-        - PolicyDocument:
-            Statement:
-              - Action:
-                  - 'logs:CreateLogStream'
-                Effect: Allow
-                Resource: !Sub '${CloudTrailCWLogsGroup.Arn}'
-              - Action:
-                  - 'logs:PutLogEvents'
-                Effect: Allow
-                Resource: !Sub '${CloudTrailCWLogsGroup.Arn}'
-            Version: 2012-10-17
-          PolicyName: CloudtrailInteractionPolicy
-  #Config
-  ConfigRole:
-    Type: 'AWS::IAM::Role'
-    Condition: ConfigEnabled
-    Properties:
-      AssumeRolePolicyDocument:
-        Statement:
-          - Action:
-              - 'sts:AssumeRole'
-            Effect: Allow
-            Principal:
-              Service: config.amazonaws.com
-        Version: 2012-10-17
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AWS_ConfigRole'
-      Path: /service-role/
-      Policies:
-        - PolicyDocument:
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 's3:PutObject'
-                Resource: !Sub 'arn:aws:s3:::${ConfigBucket}/*'
-              - Effect: Allow
-                Action:
-                  - 's3:GetBucketAcl'
-                Resource: !Sub 'arn:aws:s3:::${ConfigBucket}'
-            Version: 2012-10-17
-          PolicyName: ConfigServiceS3
-  ConfigDeliveryChannel:
-    Type: 'AWS::Config::DeliveryChannel'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html
-    Condition: ConfigEnabled
-    Properties:
-      Name: default
-      ConfigSnapshotDeliveryProperties:
-        DeliveryFrequency: !Ref ConfigSnapshotFrequency
-      S3BucketName: !Ref ConfigBucket
-  ConfigRecorder:
-    Type: 'AWS::Config::ConfigurationRecorder'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html
-    Condition: ConfigEnabled
-    Properties:
-      Name: default
-      RecordingGroup:
-        AllSupported: 'true'
-        IncludeGlobalResourceTypes: 'true'
-      RoleARN: !Sub '${ConfigRole.Arn}'
-  ConfigBucket:
-    Type: 'AWS::S3::Bucket'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
-    Condition: ConfigEnabled
-    Properties:
-      BucketName: !Ref ConfigBucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      LoggingConfiguration: !If 
-        - BucketLoggingEnabled
-        - DestinationBucketName: !Ref S3AccessLogsBucketName
-          LogFilePrefix: !Join 
-            - ''
-            - - !Ref ConfigBucketName
-              - /
-        - !Ref 'AWS::NoValue'
-      VersioningConfiguration:
-        Status: Enabled
-      LifecycleConfiguration:
-        Rules:
-          - Id: Delete
-            Status: Enabled
-            ExpirationInDays: !Ref ConfigS3RetentionTime
-    DeletionPolicy: Delete
-  ConfigBucketPolicy:
-    Type: 'AWS::S3::BucketPolicy'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
-    Condition: ConfigEnabled
-    DependsOn:
-      - ConfigBucket
-    Properties:
-      Bucket: !Ref ConfigBucket
-      PolicyDocument:
-        Id: ConfigService
-        Statement:
-          - !If 
-            - S3BucketExplicitDenyEnabled
-            - Action:
-                - 's3:DeleteBucket'
-                - 's3:DeleteBucketPolicy'
-                - 's3:DeleteBucketWebsite'
-                - 's3:DeleteObject'
-                - 's3:DeleteObjectVersion'
-                - 's3:PutAccelerateConfiguration'
-                - 's3:PutBucketAcl'
-                - 's3:PutBucketCORS'
-                - 's3:PutBucketLogging'
-                - 's3:PutBucketPolicy'
-                - 's3:PutBucketRequestPayment'
-                - 's3:PutBucketVersioning'
-                - 's3:PutBucketWebsite'
-                - 's3:PutLifecycleConfiguration'
-                - 's3:PutReplicationConfiguration'
-                - 's3:ReplicateDelete'
-                - 's3:ReplicateObject'
-                - 's3:RestoreObject'
-              Effect: Deny
-              Principal: '*'
-              Resource:
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref ConfigBucket
-                    - /*
-                - !Join 
-                  - ''
-                  - - 'arn:aws:s3:::'
-                    - !Ref ConfigBucket
-              Sid: DenyDestructiveActions
-            - !Ref 'AWS::NoValue'
-          - Action: 's3:GetBucketAcl'
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Resource: !Join 
-              - ''
-              - - 'arn:aws:s3:::'
-                - !Ref ConfigBucket
-            Sid: ConfigServiceACLCheck
-          - Action: 's3:PutObject'
-            Condition:
-              StringEquals:
-                's3:x-amz-acl': bucket-owner-full-control
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Resource:
-              - !Join 
-                - ''
-                - - 'arn:aws:s3:::'
-                  - !Ref ConfigBucket
-                  - /*
-            Sid: ConfigServiceWrite
-        Version: 2012-10-17
-  #GuardDuty
-  GuardDutyDetector:
-    Type: 'AWS::GuardDuty::Detector'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html
-    Condition: GuardDutyEnabled
-    Properties:
-      Enable: true
-      FindingPublishingFrequency: FIFTEEN_MINUTES
-  GuardDutySNSTopic:
-    Type: 'AWS::SNS::Topic'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html
-    Condition: GuardDutyEnabled
-    Properties:
-      TopicName: GuardDuty-Email
-  GuardDutyCWEvent:
-    Type: 'AWS::Events::Rule'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html
-    Condition: GuardDutyEnabled
-    Properties:
-      Description: GuardDuty Email Event
-      EventPattern:
-        source:
-          - aws.guardduty
-        detail-type:
-          - GuardDuty Finding
-      State: ENABLED
-      Targets:
-        - Arn: !Ref GuardDutySNSTopic
-          Id: GuardDuty-Email
-  GuardDutySNSSubscription:
-    Type: 'AWS::SNS::Subscription'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html
-    Condition: GuardDutyEnabled
-    Properties:
-      Endpoint: !Ref GuardDutyEmailAddress
-      Protocol: email
-      TopicArn: !Ref GuardDutySNSTopic
-
-Outputs:
-  CloudTrailBucketName:
-    Description: S3 bucket for CloudTrail logs
-    Value: !Ref CloudTrailDestinationBucket
-    Export:
-      Name: !Sub '${AWS::StackName}-CloudTrailBucketName'
diff --git a/static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/staticwebapp.yaml b/static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/staticwebapp.yaml
deleted file mode 100644
index bde34f6cd..000000000
--- a/static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/staticwebapp.yaml
+++ /dev/null
@@ -1,411 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for a static web app. This template installs a highly-available, scalable web application deployment.
-  It demonstrates using the AWS CloudFormation bootstrap scripts to deploy a stateless web application.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-Parameters:
-  #General:
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: WebApp1
-  #Imports:
-  VPCImportName:
-    Type: String
-    Description: 'The CloudFormation name of the VPC stack to import'
-    Default: 'WebApp1-VPC'
-    MinLength: '3'
-    MaxLength: '32'
-  VPCImportApp1Instance1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 1'
-    Default: 'App1Subnet1'
-  VPCImportApp1Instance1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 2'
-    Default: 'App1Subnet2'
-  VPCImportApp1Instance1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 3'
-    Default: 'App1Subnet3'
-  VPCImportALB1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet1'
-  VPCImportALB1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet2'
-  VPCImportALB1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet3'
-  #Application Tier
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t3.medium
-      - t3.large
-    ConstraintDescription: must be a valid EC2 instance type.
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  ALBSGSource:
-    Description: The IP address range that can be used to access the web app
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-  Web1AutoScaleDesired:
-    Default: '2'
-    Description: The desired number of web instances in auto scaling group
-    Type: Number
-    MinValue: '2'
-    MaxValue: '6'
-    ConstraintDescription: must be between 2 and 6 EC2 instances.
-Resources:
-  ALB1SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref ALBSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref ALBSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Load Balancer
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  ALB1LoadBalancer:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
-    Properties:
-      #IpAddressType:
-      # Name: String
-      # Scheme: String
-      SecurityGroups:
-        - Ref: ALB1SecurityGroup
-      # SubnetMappings:
-      #   - SubnetMapping
-      Subnets:
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet1}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet2}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet3}'
-      # Tags:
-      #   - Resource Tag
-  ALB1Listener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
-    Properties:
-      #  Certificates:
-        #- Certificate
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref ALB1TargetGroup
-      LoadBalancerArn: !Ref ALB1LoadBalancer
-      Port: '80'
-      Protocol: HTTP
-      #SslPolicy: String
-  ALB1TargetGroup:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
-    Properties:
-      HealthCheckPath: /index.html
-      HealthCheckIntervalSeconds: 5
-      HealthCheckTimeoutSeconds: 3
-      HealthyThresholdCount: 2
-      Port: 80
-      Protocol: HTTP
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 10
-      UnhealthyThresholdCount: 3
-      VpcId: 
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  Web1InstanceSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 restricted to the load balancer
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Instance
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  Web1AutoScalingGroup:
-    Type: 'AWS::AutoScaling::AutoScalingGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html
-    Properties:
-      AutoScalingGroupName: !Sub '${NamingPrefix}'
-      VPCZoneIdentifier:
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet1'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet2'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet3'
-      LaunchConfigurationName: !Ref Web1LaunchConfig
-      MinSize: '1'
-      MaxSize: '9'
-      DesiredCapacity: !Ref Web1AutoScaleDesired
-      TargetGroupARNs:
-        - !Ref ALB1TargetGroup
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}'
-          PropagateAtLaunch: true
-    UpdatePolicy:
-      AutoScalingReplacingUpdate:
-        WillReplace: 'true'
-      # AutoScalingRollingUpdate:
-      #   MinInstancesInService: '3'
-      #   MaxBatchSize: '2'
-      #   PauseTime: PT5M
-  Web1LaunchConfig:
-    Type: 'AWS::AutoScaling::LaunchConfiguration'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html
-    Properties:
-      ImageId: !Ref LatestAmiId
-      IamInstanceProfile: !Ref Web1InstanceInstanceProfile
-      InstanceType: !Ref InstanceType
-      SecurityGroups:
-        - !Ref Web1InstanceSecurityGroup
-      UserData:
-        Fn::Base64: !Sub |
-          #!/bin/bash -xe
-          echo "Installing Amazon CloudWatch Agent"
-          wget https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm
-          wget https://www.wellarchitectedlabs.com/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/amazon-cloudwatch-agent.json -P /opt/aws/amazon-cloudwatch-agent/etc/
-          rpm -U ./amazon-cloudwatch-agent.rpm
-          /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s 
-          echo "Installing apache httpd"
-          yum install -y httpd
-          echo "Creating index.html"
-          echo "<html>" >> /var/www/html/index.html
-          echo "<head>" >> /var/www/html/index.html
-          echo "<title>Hello World</title>" >> /var/www/html/index.html
-          echo "</head>" >> /var/www/html/index.html
-          echo "<body>" >> /var/www/html/index.html
-          echo "<h1>Hello World from " >> /var/www/html/index.html
-          curl http://169.254.169.254/latest/meta-data/instance-id >> /var/www/html/index.html
-          echo "</h1>" >> /var/www/html/index.html
-          echo "</body>" >> /var/www/html/index.html
-          echo "</html>" >> /var/www/html/index.html
-          chmod 644 /var/www/html/index.html
-          chown root /var/www/html/index.html
-          chgrp wheel /var/www/html/index.html
-          echo "Starting httpd..."
-          service httpd start
-          chkconfig httpd on
-          echo "Updating Amazon ssm agent..."
-          yum update amazon-ssm-agent -y
-          echo "UserData Complete"
-  Web1InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-EC2'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      #To simplify management of the role we will use inline policies: https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_managed-vs-inline.html
-      Policies:
-        - PolicyName: ec2
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'ec2:DescribeInstanceStatus'
-                Resource: '*'
-              - Effect: Allow
-                Action:
-                  - 'ec2:DescribeTags'
-                Resource: '*'
-              - Effect: Allow
-                Action:
-                  - 'ec2:DescribeVolumes'
-                Resource: '*'
-        - PolicyName: cloudwatch
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'logs:CreateLogGroup'
-                Resource: !Sub 'arn:${AWS::Partition}:logs:${AWS::Region}:${AWS::AccountId}:log-group:${NamingPrefix}*'
-              - Effect: Allow
-                Action:
-                  - 'cloudwatch:PutMetricData'
-                Resource: '*'
-              - Effect: Allow
-                Action: 
-                  - 'logs:CreateLogStream'
-                  - 'logs:DescribeLogStreams'
-                Resource: !Sub 'arn:${AWS::Partition}:logs:${AWS::Region}:${AWS::AccountId}:log-group:${NamingPrefix}*'
-              - Effect: Allow
-                Action: 
-                  - 'logs:PutLogEvents'
-                Resource: !Sub 'arn:${AWS::Partition}:logs:${AWS::Region}:${AWS::AccountId}:log-group:${NamingPrefix}*:log-stream:*'
-        - PolicyName: ssm-s3
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 's3:GetObject'
-                Resource:
-                - !Sub 'arn:aws:s3:::aws-ssm-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::aws-windows-downloads-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::amazon-ssm-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::amazon-ssm-packages-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::${AWS::Region}-birdwatcher-prod/*'
-                - !Sub 'arn:aws:s3:::patch-baseline-snapshot-${AWS::Region}/*'
-        - PolicyName: ssm
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'ssm:GetDeployablePatchSnapshotForInstance'
-                  - 'ssm:GetManifest'
-                  - 'ssm:ListAssociations'
-                  - 'ssm:ListInstanceAssociations'
-                  - 'ssm:PutInventory'
-                  - 'ssm:PutComplianceItems'
-                  - 'ssm:PutConfigurePackageResult'
-                  - 'ssm:UpdateInstanceAssociationStatus'
-                  - 'ssm:UpdateInstanceInformation'
-                  - 'ssmmessages:CreateControlChannel'
-                  - 'ssmmessages:CreateDataChannel'
-                  - 'ssmmessages:OpenControlChannel'
-                  - 'ssmmessages:OpenDataChannel'
-                Resource: '*'
-              - Effect: Allow
-                Action: 
-                  - 'ssm:DescribeAssociation'
-                  - 'ssm:GetDocument'
-                  - 'ssm:DescribeDocument'
-                  - 'ssm:UpdateAssociationStatus'
-                Resource: !Sub 'arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:document/*'
-              - Effect: Allow
-                Action: 
-                  - 'ssm:GetParameters'
-                Resource: !Sub 'arn:${AWS::Partition}:ssm:${AWS::Region}:${AWS::AccountId}:parameter/*'
-        - PolicyName: ec2messages
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'ec2messages:AcknowledgeMessage'
-                  - 'ec2messages:DeleteMessage'
-                  - 'ec2messages:FailMessage'
-                  - 'ec2messages:GetEndpoint'
-                  - 'ec2messages:GetMessages'
-                  - 'ec2messages:SendReply'
-                Resource: '*'
-        #Allow secrets manager for future use
-        # - PolicyName: Web1InstanceSecretsManager
-        #   PolicyDocument:
-        #     Version: 2012-10-17
-        #     Statement:
-        #       - Effect: Allow
-        #         Action: 'secretsmanager:GetSecretValue'
-        #         Resource:
-  Web1InstanceInstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /Web1InstanceEc2Role/
-      Roles:
-        - !Ref Web1InstanceRole
-Outputs:
-  WebsiteURL:
-    Value: !Join
-      - ''
-      - - 'http://'
-        - !GetAtt 
-          - ALB1LoadBalancer
-          - DNSName
-        - /index.html
-    Description: Static Website
-Metadata: 
-  AWS::CloudFormation::Interface: 
-    ParameterGroups: 
-      - 
-        Label: 
-          default: "General Configuration"
-        Parameters: 
-          - NamingPrefix
-      - 
-        Label: 
-          default: "VPC Stack Imports"
-        Parameters: 
-          - VPCImportName
-          - VPCImportApp1Instance1Subnet1
-          - VPCImportApp1Instance1Subnet2
-          - VPCImportApp1Instance1Subnet3
-          - VPCImportALB1Subnet1
-          - VPCImportALB1Subnet2
-          - VPCImportALB1Subnet3
-      - 
-        Label: 
-          default: "Application Tier Configuration"
-        Parameters:
-          - LatestAmiId
-          - InstanceType
-          - Web1AutoScaleDesired
-          - ALBSGSource
diff --git a/static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/wordpress.yaml b/static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/wordpress.yaml
deleted file mode 100644
index 587c1ecca..000000000
--- a/static/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/wordpress.yaml
+++ /dev/null
@@ -1,589 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template for WordPress. This template installs a highly-available, scalable WordPress deployment using a multi-az
-  Amazon RDS database instance for storage. It demonstrates using the AWS CloudFormation bootstrap scripts to deploy WordPress.
-
-  **WARNING** You will be billed for the AWS resources created if you create a stack from this template.
-
-  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-Parameters:
-  #General:
-  NamingPrefix:
-    Type: String
-    Description: The naming prefix for resources created by this template.
-    Default: WebApp1
-  #Imports:
-  VPCImportName:
-    Type: String
-    Description: 'The CloudFormation name of the VPC stack to import'
-    Default: 'WebApp1-VPC'
-    MinLength: '3'
-    MaxLength: '32'
-  VPCImportApp1Instance1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 1'
-    Default: 'App1Subnet1'
-  VPCImportApp1Instance1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 2'
-    Default: 'App1Subnet2'
-  VPCImportApp1Instance1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import for subnet 3'
-    Default: 'App1Subnet3'
-  VPCImportALB1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet1'
-  VPCImportALB1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet2'
-  VPCImportALB1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'ALB1Subnet3'
-  VPCImportDB1Subnet1:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'DB1Subnet1'
-  VPCImportDB1Subnet2:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'DB1Subnet2'
-  VPCImportDB1Subnet3:
-    Type: String
-    Description: 'The name of the subnet from VPC stack to import'
-    Default: 'DB1Subnet3'
-  #Application Tier
-  LatestAmiId:
-    Type: 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  InstanceType:
-    Description: WebServer EC2 instance type
-    Type: String
-    Default: t3.micro
-    AllowedValues:
-      - t3.nano
-      - t3.micro
-      - t3.small
-      - t3.medium
-      - t3.large
-    ConstraintDescription: must be a valid EC2 instance type.
-  ALBSGSource:
-    Description: Your IP address range that will be used to access the WordPress instance behing the ALB.
-    Type: String
-    MinLength: '9'
-    MaxLength: '18'
-    Default: 0.0.0.0/0
-    AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
-    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
-  Web1AutoScaleDesired:
-    Default: '1'
-    Description: The desired number of web instances in auto scaling group
-    Type: Number
-    MinValue: '1'
-    MaxValue: '6'
-    ConstraintDescription: must be between 1 and 6 EC2 instances.
-  #Database Tier
-  DB1Name:
-    Default: wordpressdb
-    Description: The WordPress database name
-    Type: String
-    MinLength: '1'
-    MaxLength: '64'
-    AllowedPattern: '[a-zA-Z][a-zA-Z0-9]*'
-    ConstraintDescription: Must begin with a letter and contain only alphanumeric characters.
-
-Resources:
-  ALB1SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 to the allowed CIDR
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          CidrIp: !Ref ALBSGSource
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          CidrIp: !Ref ALBSGSource
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Load Balancer
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  ALB1LoadBalancer:
-    Type: 'AWS::ElasticLoadBalancingV2::LoadBalancer'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
-    Properties:
-      #IpAddressType:
-      # Name: String
-      # Scheme: String
-      SecurityGroups:
-        - Ref: ALB1SecurityGroup
-      # SubnetMappings:
-      #   - SubnetMapping      
-      Subnets:
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet1}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet2}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportALB1Subnet3}'
-      # Tags:
-      #   - Resource Tag
-  ALB1Listener:
-    Type: 'AWS::ElasticLoadBalancingV2::Listener'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
-    Properties:
-      #  Certificates:
-        #- Certificate
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref ALB1TargetGroup
-      LoadBalancerArn: !Ref ALB1LoadBalancer
-      Port: '80'
-      Protocol: HTTP
-      #SslPolicy: String
-  ALB1TargetGroup:
-    Type: 'AWS::ElasticLoadBalancingV2::TargetGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
-    Properties:
-      HealthCheckPath: /wordpress/wp-admin/install.php
-      HealthCheckIntervalSeconds: 10
-      #HealthCheckPath: 
-      #HealthCheckPort: 
-      #HealthCheckProtocol:
-      HealthCheckTimeoutSeconds: 5
-      HealthyThresholdCount: 2
-      #Name: 
-      Port: 80
-      Protocol: HTTP
-      #Tags:
-        #-
-      TargetGroupAttributes:
-        - Key: stickiness.enabled
-          Value: 'true'
-        - Key: stickiness.type
-          Value: lb_cookie
-        - Key: stickiness.lb_cookie.duration_seconds
-          Value: '30'
-      # Targets:
-      #   - TargetDescription
-      # TargetType: String
-      UnhealthyThresholdCount: 5
-      VpcId: 
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  Web1InstanceSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: >-
-        Enable HTTP access via port 80 and 443 restricted to the load balancer
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '80'
-          ToPort: '80'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-        - IpProtocol: tcp
-          FromPort: '443'
-          ToPort: '443'
-          SourceSecurityGroupId: !Select 
-            - 0
-            - !GetAtt 
-              - ALB1LoadBalancer
-              - SecurityGroups
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Instance
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  Web1InstanceAutoScalingGroup:
-    Type: 'AWS::AutoScaling::AutoScalingGroup'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html
-    Properties:
-      AutoScalingGroupName: !Sub '${NamingPrefix}'
-      VPCZoneIdentifier:
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet1'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet2'
-        - Fn::ImportValue: !Sub '${VPCImportName}-App1Subnet3'
-      LaunchConfigurationName: !Ref Web1LaunchConfig
-      MinSize: '1'
-      MaxSize: '5'
-      DesiredCapacity: !Ref Web1AutoScaleDesired
-      TargetGroupARNs:
-        - !Ref ALB1TargetGroup
-      Tags:
-        - Key: Name
-          Value: !Sub '${NamingPrefix}'
-          PropagateAtLaunch: true
-    CreationPolicy:
-      ResourceSignal:
-        Timeout: PT15M
-    UpdatePolicy:
-      AutoScalingRollingUpdate:
-        MinInstancesInService: '1'
-        MaxBatchSize: '1'
-        PauseTime: PT15M
-        WaitOnResourceSignals: 'true'
-  Web1LaunchConfig:
-    Type: 'AWS::AutoScaling::LaunchConfiguration'
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html
-    Metadata:
-      'AWS::CloudFormation::Init':
-        configSets:
-          wordpress_install:
-            - install_cfn
-            - install_wordpress
-        install_cfn:
-          files:
-            /etc/cfn/cfn-hup.conf:
-              content: !Sub |
-                [main]
-                stack= ${AWS::StackId}
-                region=${AWS::Region}
-              mode: '000400'
-              owner: root
-              group: root
-            /etc/cfn/hooks.d/cfn-auto-reloader.conf:
-              content:  !Sub |
-                [cfn-auto-reloader-hook]
-                triggers=post.update
-                path=Resources.WebServer.Metadata.AWS::CloudFormation::Init
-                action=/opt/aws/bin/cfn-init -v --stack ${AWS::StackName} --resource Web1LaunchConfig --configsets wordpress_install --region ${AWS::Region}
-              mode: '000400'
-              owner: root
-              group: root
-          services:
-            sysvinit:
-              cfn-hup:
-                enabled: true
-                ensureRunning: true
-                files:
-                  - /etc/cfn/cfn-hup.conf
-                  - /etc/cfn/hooks.d/cfn-auto-reloader.conf
-        install_wordpress:
-          packages:
-            yum:
-              jq: []
-              awslogs: []
-              httpd: []
-              php: []
-              php-mysql: []
-          sources:
-            /var/www/html: 'https://wordpress.org/wordpress-5.1.1.tar.gz'
-          files:
-            /tmp/create-wp-config:
-              content: !Sub |
-                #!/bin/bash -xe
-                echo "Installing Amazon CloudWatch Agent"
-                wget https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm
-                wget https://www.wellarchitectedlabs.com/Security/200_Automated_Deployment_of_EC2_Web_Application/Code/amazon-cloudwatch-agent.json -P /opt/aws/amazon-cloudwatch-agent/etc/
-                rpm -U ./amazon-cloudwatch-agent.rpm
-                /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s 
-                cp /var/www/html/wordpress/wp-config-sample.php /var/www/html/wordpress/wp-config.php
-                sed -i "s/'database_name_here'/'${DB1Name}'/g" wp-config.php
-                sed -i "s/'username_here'/'admin'/g" wp-config.php
-                secret="$(aws secretsmanager get-secret-value --secret-id ${DB1Secret} --region ${AWS::Region} --query SecretString --output text |jq '.password' |sed -e 's/^\"//g' |sed -e 's/\"$//g')"
-                sed -i "s/password_here/$secret/g" wp-config.php
-                sed -i "s/'localhost'/'${DB1Cluster.Endpoint.Address}'/g" wp-config.php
-                chown -R apache /var/www
-                chgrp -R apache /var/www
-                chmod 2775 /var/www
-                find /var/www -type d -exec sudo chmod 2775 {} \;
-                find /var/www -type f -exec sudo chmod 0664 {} \;
-              mode: '000500'
-              owner: root
-              group: root
-          commands:
-            01_configure_wordpress:
-              command: /tmp/create-wp-config
-              cwd: /var/www/html/wordpress
-          services:
-            sysvinit:
-              httpd:
-                enabled: 'true'
-                ensureRunning: 'true'
-    Properties:
-      ImageId: !Ref LatestAmiId
-      IamInstanceProfile: !Ref Web1InstanceInstanceProfile
-      InstanceType: !Ref InstanceType
-      SecurityGroups:
-        - !Ref Web1InstanceSecurityGroup
-      #KeyName: A best practice is to use Systems Manager instead of directly accessing instances manually 
-      UserData:
-        Fn::Base64: !Sub |
-          #!/bin/bash -xe
-          #yum update -y
-          echo "Installing aws-cfn-bootstrap"
-          yum install -y aws-cfn-bootstrap
-          echo "Executing cfn-init..." 
-          /opt/aws/bin/cfn-init -v --stack ${AWS::StackName} --resource Web1LaunchConfig --configsets wordpress_install --region ${AWS::Region}
-          echo "Executing cfn-signal..."
-          /opt/aws/bin/cfn-signal -e $? --stack ${AWS::StackName} --resource Web1InstanceAutoScalingGroup --region ${AWS::Region}
-          echo "Restarting httpd..."
-          service httpd restart
-          echo "UserData Complete"
-  Web1InstanceRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${NamingPrefix}-EC2-${AWS::StackName}'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: ec2
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action:
-                  - 'ec2:DescribeInstanceStatus'
-                Resource: '*'
-        - PolicyName: cloudwatch
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'logs:CreateLogGroup'
-                  - 'logs:CreateLogStream'
-                  - 'logs:PutLogEvents'
-                  - 'logs:DescribeLogStreams'
-                Resource: 'arn:aws:logs:*:*:*'
-              - Effect: Allow
-                Action:
-                  - 'cloudwatch:PutMetricData'
-                Resource: '*'
-        - PolicyName: s3
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 's3:GetObject'
-                Resource:
-                - !Sub 'arn:aws:s3:::aws-ssm-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::aws-windows-downloads-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::amazon-ssm-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::amazon-ssm-packages-${AWS::Region}/*'
-                - !Sub 'arn:aws:s3:::${AWS::Region}-birdwatcher-prod/*'
-                - !Sub 'arn:aws:s3:::patch-baseline-snapshot-${AWS::Region}/*'
-        - PolicyName: ssm
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'ssm:DescribeAssociation'
-                  - 'ssm:GetDeployablePatchSnapshotForInstance'
-                  - 'ssm:GetDocument'
-                  - 'ssm:DescribeDocument'
-                  - 'ssm:GetManifest'
-                  - 'ssm:GetParameters'
-                  - 'ssm:ListAssociations'
-                  - 'ssm:ListInstanceAssociations'
-                  - 'ssm:PutInventory'
-                  - 'ssm:PutComplianceItems'
-                  - 'ssm:PutConfigurePackageResult'
-                  - 'ssm:UpdateAssociationStatus'
-                  - 'ssm:UpdateInstanceAssociationStatus'
-                  - 'ssm:UpdateInstanceInformation'
-                  - 'ssmmessages:CreateControlChannel'
-                  - 'ssmmessages:CreateDataChannel'
-                  - 'ssmmessages:OpenControlChannel'
-                  - 'ssmmessages:OpenDataChannel'
-                Resource: '*'
-        - PolicyName: ec2messages
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'ec2messages:AcknowledgeMessage'
-                  - 'ec2messages:DeleteMessage'
-                  - 'ec2messages:FailMessage'
-                  - 'ec2messages:GetEndpoint'
-                  - 'ec2messages:GetMessages'
-                  - 'ec2messages:SendReply'
-                Resource: '*'
-        - PolicyName: Web1InstanceSecretsManager
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                #Action: 'secretsmanager:GetSecretValue'
-                Action: 'secretsmanager:*'
-                Resource: '*'
-  Web1InstanceInstanceProfile:
-    Type: 'AWS::IAM::InstanceProfile'
-    Properties:
-      Path: /Web1InstanceEc2Role/
-      Roles:
-        - !Ref Web1InstanceRole
-  DB1Secret:
-    Type: AWS::SecretsManager::Secret
-    Properties:
-      Description: 'This is the secret for my RDS instance'
-      GenerateSecretString:
-        SecretStringTemplate: '{"username": "admin"}'
-        GenerateStringKey: 'password'
-        PasswordLength: 16
-        ExcludePunctuation: true
-  DB1SecretAttachment:
-    Type: AWS::SecretsManager::SecretTargetAttachment
-    Properties:
-      SecretId: !Ref DB1Secret
-      TargetId: !Ref DB1Cluster
-      TargetType: AWS::RDS::DBCluster
-  DB1EC2SecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Database access from web tier
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: '3306'
-          ToPort: '3306'
-          SourceSecurityGroupId: !Ref Web1InstanceSecurityGroup
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - Database
-      VpcId:
-        Fn::ImportValue: !Sub '${VPCImportName}'
-  DB1SubnetGroup:
-    Type: "AWS::RDS::DBSubnetGroup"
-    #https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html
-    Properties: 
-      DBSubnetGroupDescription: !Sub '${NamingPrefix}-SubnetGroup'
-      DBSubnetGroupName: !Sub 'dbsubnetgroupwp'
-      SubnetIds:
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportDB1Subnet1}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportDB1Subnet2}'
-        - Fn::ImportValue: !Sub '${VPCImportName}-${VPCImportDB1Subnet3}'
-      Tags:
-        - Key: Name
-          Value: !Join
-            - '-'
-            - - !Ref NamingPrefix
-              - SubnetGroup
-  DB1Cluster:
-    Type: AWS::RDS::DBCluster
-    DeletionPolicy: Delete
-    Properties:
-      DatabaseName: !Ref DB1Name
-      MasterUsername: !Join ['', ['{{resolve:secretsmanager:', !Ref DB1Secret, ':SecretString:username}}' ]]
-      MasterUserPassword: !Join ['', ['{{resolve:secretsmanager:', !Ref DB1Secret, ':SecretString:password}}' ]]
-      StorageEncrypted: true
-      Engine: aurora
-      EngineMode: serverless
-      KmsKeyId: !Ref DB1KMSKey
-      VpcSecurityGroupIds:
-        - !Ref DB1EC2SecurityGroup
-      DBSubnetGroupName: !Ref DB1SubnetGroup
-      DBClusterParameterGroupName: !Ref DB1ClusterParameterGroup
-      DBClusterIdentifier: !Ref AWS::StackName
-      ScalingConfiguration:
-        AutoPause: true
-        MaxCapacity: 16
-        MinCapacity: 2
-        SecondsUntilAutoPause: 300
-  DB1ClusterParameterGroup:
-    Type: AWS::RDS::DBClusterParameterGroup
-    Properties:
-      Description: Sample Aurora Cluster Parameter Group
-      Family: aurora5.6
-      Parameters:
-        time_zone: UTC
-  DB1KMSKey:
-    Type: AWS::KMS::Key
-    Properties:
-      Description: !Sub '${NamingPrefix}-Key'
-      KeyPolicy:
-        Version: 2012-10-17
-        Id: key-iam-permission
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS: !Join 
-                - ''
-                - - 'arn:aws:iam::'
-                  - !Ref 'AWS::AccountId'
-                  - ':root'
-            Action: 'kms:*'
-            Resource: '*'
-
-Outputs:
-  WebsiteURL:
-    Value: !Join
-      - ''
-      - - 'http://'
-        - !GetAtt 
-          - ALB1LoadBalancer
-          - DNSName
-        - /wordpress
-    Description: WordPress Website
-Metadata: 
-  AWS::CloudFormation::Interface: 
-    ParameterGroups: 
-      - 
-        Label: 
-          default: "General Configuration"
-        Parameters: 
-          - NamingPrefix
-      - 
-        Label: 
-          default: "Application Tier Configuration"
-        Parameters: 
-          - InstanceType
-          - Web1AutoScaleDesired
-          - ALBSGSource
-      - 
-        Label: 
-          default: "Database Tier Configuration"
-        Parameters:
-          - DB1Name
-      - 
-        Label: 
-          default: "VPC Stack Imports"
-        Parameters: 
-          - VPCImportName
-          - VPCImportApp1Instance1Subnet1
-          - VPCImportApp1Instance1Subnet2
-          - VPCImportApp1Instance1Subnet3
-          - VPCImportALB1Subnet1
-          - VPCImportALB1Subnet2
-          - VPCImportALB1Subnet3
-          - VPCImportDB1Subnet1
-          - VPCImportDB1Subnet2
-          - VPCImportDB1Subnet3
-
diff --git a/static/Security/200_Automated_Deployment_of_IAM_Groups_and_Roles/Code/baseline-iam.yaml b/static/Security/200_Automated_Deployment_of_IAM_Groups_and_Roles/Code/baseline-iam.yaml
deleted file mode 100644
index 0880930dd..000000000
--- a/static/Security/200_Automated_Deployment_of_IAM_Groups_and_Roles/Code/baseline-iam.yaml
+++ /dev/null
@@ -1,539 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  Account Baseline IAM Groups, Roles and Managed Policies.
-  **WARNING** You will be billed for the AWS resources created if you create a 
-  stack from this template.
-
-  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-
-Parameters:
-  AllowRegion:
-    Type: String
-    Description: 'A single region e.g. us-east-1 that resources can be created in, where service supports this permissions including EC2'
-    Default: 'us-east-1'  
-  BaselineNamePrefix:
-    Type: String
-    Description: 'The prefix for roles, groups and policies created by this stack'
-    Default: 'Baseline'
-  BaselineExportName:
-    Type: String
-    Description: 'The CloudFormation export name prefix used with the resource name for the resources created, eg Baseline-PrivilegedAdminRole'
-    Default: 'Baseline'
-    MinLength: '3'
-    MaxLength: '32'
-  # BaselineS3TemplateBucket:
-  #   Type: String
-  #   Description: Case sensitive bucket name that contains cloudformation templates
-  #   Default: ''
-  IdentityManagementAccount:
-    Type: String
-    Description: AccountId that is trusted to assume all roles, or blank for no cross-account trust. Note that the trusted account also needs to be appropriately secured.
-    Default: ''
-  ToolingManagementAccount:
-    Type: String
-    Description: AccountId that is trusted to assume the ReadOnly and StackSet roles, or blank for no cross-account trust. Note that the trusted account also needs to be appropriately secured.
-    Default: ''
-  OrganizationsRootAccount:
-    Type: String
-    Description: AccountId that is trusted to assume Organizations role, or blank for no cross-account trust. Note that the trusted account also needs to be appropriately secured.
-    Default: ''
-Conditions:
-  LinkToIdentityManagementAccount: !Not
-    - !Equals
-      - !Ref IdentityManagementAccount
-      - ''
-  LinkToToolingManagementAccount: !Not
-    - !Equals
-      - !Ref ToolingManagementAccount
-      - ''
-  LinkToOrganizationsRootAccount: !Not
-    - !Equals
-      - !Ref OrganizationsRootAccount
-      - ''
-Resources:
-  ManageSelfIAMUserGroupPolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-ManageSelfIAMUserGroupPolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} managing own IAM user'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action: 'iam:GetAccountPasswordPolicy'
-            Resource: '*'
-          - Sid: AllowUsersToListMFADevicesandUsersForConsole
-            Effect: Allow
-            Action:
-              - 'iam:ListMFADevices'
-              - 'iam:ListVirtualMFADevices'
-              - 'iam:ListUsers'
-            Resource: '*'
-          - Effect: Allow
-            Action:
-              - 'iam:ChangePassword'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:user/${!aws:username}'
-          - Sid: AllowUsersToDeactivateTheirOwnVirtualMFADevice
-            Effect: Allow
-            Action:
-              - 'iam:DeactivateMFADevice'
-              - 'iam:*LoginProfile'
-              - 'iam:*AccessKey*'
-              - 'iam:*SSHPublicKey*'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:user/${!aws:username}'
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:mfa/${!aws:username}'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': true
-          - Sid: AllowUsersToCreateEnableResyncDeleteTheirOwnVirtualMFADevice
-            Effect: Allow
-            Action:
-              - 'iam:CreateVirtualMFADevice'
-              - 'iam:EnableMFADevice'
-              - 'iam:ResyncMFADevice'
-              - 'iam:DeleteVirtualMFADevice'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:user/${!aws:username}'
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:mfa/${!aws:username}'
-  ManageSelfIAMUserGroup:
-    Type: 'AWS::IAM::Group'
-    DependsOn:
-      - ManageSelfIAMUserGroupPolicy
-    Properties:
-      GroupName: !Sub '${BaselineNamePrefix}-ManageSelf'
-      ManagedPolicyArns:
-        - !Ref ManageSelfIAMUserGroupPolicy
-      Path: /
-  AccountWideReadOnlyRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${BaselineNamePrefix}-AccountWideReadOnly'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/ReadOnlyAccess'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS:
-                - !Sub 'arn:aws:iam::${AWS::AccountId}:root'
-            Action: 'sts:AssumeRole'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-          - !If
-            - LinkToIdentityManagementAccount
-            - Effect: Allow
-              Principal:
-                AWS:
-                  !Sub 'arn:aws:iam::${IdentityManagementAccount}:root'
-              Action: 'sts:AssumeRole'
-              Condition:
-                Bool:
-                  'aws:MultiFactorAuthPresent': 'true'
-            - !Ref 'AWS::NoValue'
-          - !If
-            - LinkToToolingManagementAccount
-            - Effect: Allow
-              Principal:
-                AWS:
-                  !Sub 'arn:aws:iam::${ToolingManagementAccount}:root'
-              Action: 'sts:AssumeRole'
-            - !Ref 'AWS::NoValue'
-  AccountWideReadOnlyGroup:
-    Type: 'AWS::IAM::Group'
-    DependsOn:
-      - ManageSelfIAMUserGroupPolicy
-    Properties:
-      GroupName: !Sub '${BaselineNamePrefix}-AccountWideReadOnly'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/ReadOnlyAccess'
-      Path: /
-  PrivilegedAdminGroupPolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    DependsOn:
-      - PrivilegedAdminRole
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-PrivilegedAdminGroupPolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} PrivilegedAdmin Group'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - 'sts:AssumeRole'
-              - 'sts:GetSessionToken'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:role/${PrivilegedAdminRole}'
-  PrivilegedAdminRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${BaselineNamePrefix}-PrivilegedAdmin'
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AdministratorAccess
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS:
-                - !Sub 'arn:aws:iam::${AWS::AccountId}:root'
-            Action: 'sts:AssumeRole'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-          - !If
-            - LinkToIdentityManagementAccount
-            - Effect: Allow
-              Principal:
-                AWS:
-                  !Sub 'arn:aws:iam::${IdentityManagementAccount}:root'
-              Action: 'sts:AssumeRole'
-              Condition:
-                Bool:
-                  'aws:MultiFactorAuthPresent': 'true'
-            - !Ref 'AWS::NoValue'
-  PrivilegedAdminGroup:
-    Type: 'AWS::IAM::Group'
-    DependsOn:
-      - PrivilegedAdminGroupPolicy
-      - ManageSelfIAMUserGroupPolicy
-    Properties:
-      GroupName: !Sub '${BaselineNamePrefix}-PrivilegedAdmin'
-      ManagedPolicyArns:
-        - !Ref PrivilegedAdminGroupPolicy
-      Path: /
-  RestrictedAdminGroupPolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-RestrictedAdminGroupPolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} RestrictedAdmin Group'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - 'sts:AssumeRole'
-              - 'sts:GetSessionToken'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:role/${RestrictedAdminRole}'
-  RestrictedAdminGroup:
-    Type: 'AWS::IAM::Group'
-    Properties:
-      GroupName: !Sub '${BaselineNamePrefix}-RestrictedAdmin'
-      ManagedPolicyArns:
-        - !Ref RestrictedAdminGroupPolicy
-        - !Ref ManageSelfIAMUserGroupPolicy
-      Path: /
-  RestrictedAdminRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn:
-      - RestrictedServicesDenyRolePolicy
-    Properties:
-      RoleName: !Sub '${BaselineNamePrefix}-RestrictedAdmin'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/ReadOnlyAccess'
-        - !Ref CloudFormationAdminRolePolicy
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS:
-                - !Sub 'arn:aws:iam::${AWS::AccountId}:root'
-            Action: 'sts:AssumeRole'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-          - !If
-            - LinkToIdentityManagementAccount
-            - Effect: Allow
-              Principal:
-                AWS:
-                  - !Sub 'arn:aws:iam::${IdentityManagementAccount}:root'
-              Action: 'sts:AssumeRole'
-              Condition:
-                Bool:
-                  'aws:MultiFactorAuthPresent': 'true'
-            - !Ref 'AWS::NoValue'
-  RestrictedServicesDenyRolePolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-RestrictedServicesDenyRolePolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} Explicitly Denying Services and Resources'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Deny
-            Action:
-              - 'aws-portal:ModifyAccount'
-              - 'aws-portal:ModifyBilling'
-              - 'aws-portal:ModifyPaymentMethods'
-              - 'budgets:ModifyBudget'
-            Resource:
-              - '*'
-          - Effect: Deny
-            Action:
-              - 'cloudhsm:*'
-            Resource:
-              - '*'
-  IdentityAdminRolePolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-IdentityAdminRolePolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} IdentityAdmin Role'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action: 'iam:*'
-            Resource: '*'
-  IdentityAdminGroupPolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    DependsOn:
-      - IdentityAdminRole
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-IdentityAdminGroupPolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} IdentityAdmin Group'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - 'sts:AssumeRole'
-              - 'sts:GetSessionToken'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:role/${IdentityAdminRole}'
-  IdentityAdminRole:
-    Type: 'AWS::IAM::Role'
-    DependsOn:
-      - IdentityAdminRolePolicy
-      - CloudFormationAdminRolePolicy
-    Properties:
-      RoleName: !Sub '${BaselineNamePrefix}-IdentityAdmin'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/ReadOnlyAccess'
-        - !Ref IdentityAdminRolePolicy
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS:
-                - !Sub 'arn:aws:iam::${AWS::AccountId}:root'
-            Action: 'sts:AssumeRole'
-            Condition:
-              Bool:
-                'aws:MultiFactorAuthPresent': 'true'
-          - !If
-            - LinkToIdentityManagementAccount
-            - Effect: Allow
-              Principal:
-                AWS:
-                  !Sub 'arn:aws:iam::${IdentityManagementAccount}:root'
-              Action: 'sts:AssumeRole'
-              Condition:
-                Bool:
-                  'aws:MultiFactorAuthPresent': 'true'
-            - !Ref 'AWS::NoValue'
-  IdentityAdminGroup:
-    Type: 'AWS::IAM::Group'
-    DependsOn:
-      - IdentityAdminGroupPolicy
-    Properties:
-      GroupName: !Sub '${BaselineNamePrefix}-IdentityAdmin'
-      ManagedPolicyArns:
-        - !Ref IdentityAdminGroupPolicy
-      Path: /
-  CloudFormationAdminRolePolicy:
-    Type: 'AWS::IAM::ManagedPolicy'
-    Properties:
-      ManagedPolicyName: !Sub '${BaselineNamePrefix}-CloudFormationAdminRolePolicy'
-      Description: !Sub 'Policy for ${BaselineNamePrefix} CloudFormation Role'
-      Path: /
-      PolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Action:
-              - 'cloudformation:EstimateTemplateCost'
-              - 'cloudformation:PreviewStackUpdate'
-              - 'cloudformation:ValidateTemplate'
-            Resource: '*'
-          - Effect: Allow
-            Action:
-              - 'cloudformation:CancelUpdateStack'
-              - 'cloudformation:ContinueUpdateRollback'
-              - 'cloudformation:CreateChangeSet'
-              - 'cloudformation:CreateStack'
-              - 'cloudformation:DeleteStack'
-              - 'cloudformation:ExecuteChangeSet'
-              - 'cloudformation:SetStackPolicy'
-              - 'cloudformation:SignalResource'
-              - 'cloudformation:UpdateStack'
-            Resource:
-              - !Sub 'arn:aws:cloudformation:${AWS::Region}:${AWS::AccountId}:stack/*'
-              - !Sub 'arn:aws:cloudformation:${AWS::Region}:aws:transform/*'
-          - Effect: Allow
-            Action:
-              - 'iam:PassRole'
-              - 'sts:AssumeRole'
-              - 'sts:GetSessionToken'
-            Resource:
-              - !Sub 'arn:aws:iam::${AWS::AccountId}:role/${BaselineNamePrefix}-CloudFormation'
-  CloudFormationRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      RoleName: !Sub '${BaselineNamePrefix}-CloudFormation'
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: cloudformation.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Policies:
-        - PolicyName: root
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: '*'
-                Resource: '*'
-              - Effect: Deny
-                Action:
-                  - 'cloudformation:CreateStack'
-                  - 'cloudformation:UpdateStack'
-                Resource: '*'
-                Condition:
-                  StringNotEquals:
-                    'cloudformation:TemplateURL':
-                      #- !Sub 'https://s3.amazonaws.com/${BaselineS3TemplateBucket}'
-                      - !Sub 'https://s3.amazonaws.com/*'
-              - Effect: Deny
-                Action:
-                  - 'cloudformation:CreateStack'
-                  - 'cloudformation:UpdateStack'
-                Resource: '*'
-                Condition:
-                  'Null':
-                    'cloudformation:TemplateURL': 'true'
-  StackSetRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: AWSCloudFormationStackSetExecutionRole
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS:
-                - !Sub 'arn:aws:iam::${AWS::AccountId}:root'
-            Action: 'sts:AssumeRole'
-          - !If
-            - LinkToToolingManagementAccount
-            - Effect: Allow
-              Principal:
-                AWS:
-                  !Sub 'arn:aws:iam::${ToolingManagementAccount}:root'
-              Action: 'sts:AssumeRole'
-            - !Ref 'AWS::NoValue'
-      Path: /
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AdministratorAccess
-  OrganizationsRole:
-    Condition: LinkToOrganizationsRootAccount
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: OrganizationAccountAccessRole
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              AWS:
-                - !Sub 'arn:aws:iam::${OrganizationsRootAccount}:root'
-            Action: 'sts:AssumeRole'
-      Path: /
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AdministratorAccess
-Outputs:
-  ManageSelfRolePolicy:
-    Description: Manage Self Role Policy
-    Value: !Ref ManageSelfIAMUserGroupPolicy
-    Export:
-      Name: !Sub '${BaselineExportName}-ManageSelfRolePolicy'
-  AccountWideReadOnlyRole:
-    Description: Account Wide Read Only Role
-    Value: !GetAtt AccountWideReadOnlyRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-AccountWideReadOnlyRole'
-  AccountWideReadOnlyGroup:
-    Description: Account Wide Read Only Group
-    Value: !GetAtt AccountWideReadOnlyGroup.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-AccountWideReadOnlyGroup'
-  IdentityAdminRole:
-    Description: Identity Admin Role
-    Value: !GetAtt IdentityAdminRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-IdentityAdminRole'
-  PrivilegedAdminRole:
-    Description: Privileged Admin Role
-    Value: !GetAtt PrivilegedAdminRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-PrivilegedAdminRole'
-  RestrictedAdminGroup:
-    Description: Restricted Admin Group
-    Value: !Ref RestrictedAdminGroup
-    Export:
-      Name: !Sub '${BaselineExportName}-RestrictedAdminGroup'
-  RestrictedAdminRole:
-    Description: Restricted Admin Role
-    Value: !GetAtt RestrictedAdminRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-RestrictedAdminRole'
-  CloudFormationRole:
-    Description: Baseline CloudFormation Role
-    Value: !GetAtt CloudFormationRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-CloudFormationRole'
-  StackSetRole:
-    Description: Baseline StackSet Role
-    Value: !GetAtt StackSetRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-StackSetRole'
-  OrganizationsRole:
-    Condition: LinkToOrganizationsRootAccount
-    Description: Baseline Organizations Role
-    Value: !GetAtt OrganizationsRole.Arn
-    Export:
-      Name: !Sub '${BaselineExportName}-OrganizationsRole'
diff --git a/static/Security/200_Automated_Deployment_of_Web_Application_Firewall/Code/waf-global.yaml b/static/Security/200_Automated_Deployment_of_Web_Application_Firewall/Code/waf-global.yaml
deleted file mode 100644
index bcc0067b8..000000000
--- a/static/Security/200_Automated_Deployment_of_Web_Application_Firewall/Code/waf-global.yaml
+++ /dev/null
@@ -1,1023 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS WAF example for CloudFront. This AWS CloudFormation
-  template provisions WAF with basic rules for proof of concept.
-  **WARNING** You will be billed for the AWS resources created if you create a 
-  stack from this template.
-
-  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-
-Parameters:
-  WAFName:
-    Type: String
-    Default: 'Lab1'
-    Description: Enter the base name to be used for resource and export names for this stack, eg WAF will create export names combined with the base name such as Lab1-ManualBlacklistIPRule1.
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MaxLength: 10
-  WAFCloudWatchPrefix:
-    Type: String
-    Default: 'Lab1'
-    Description: Enter the name of the CloudWatch prefix to use for each rule, alphanumeric characters only
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MaxLength: 10
-  WAFManualBlacklistIPRule1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFManualBlacklistIPRule1 resource created.
-    Default: ManualBlacklistIPRule1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFManualBlacklistIPSet1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFManualBlacklistIPSet1 resource created.
-    Default: ManualBlacklistIPSet1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFUserAgentBlacklistRule1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFUserAgentBlacklistRule1 resource created.
-    Default: UserAgentBlacklistRule1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFUserAgentByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be included in the user-agent blacklist rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values. 
-  WAFUserAgentBlacklistSet1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFUserAgentBlacklistSet1 resource created.
-    Default: UserAgentBlacklistSet1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFManualBlacklistIPRule1Name:
-    Type: String
-    Default: 'ManualBlacklistIPRule1'
-    Description: Enter the name of the value to import, empty value will not create rule
-  WAFManualBlacklistIPRule1Action:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFManualBlacklistUserAgentRule1Name:
-    Type: String
-    Default: 'UserAgentBlacklistRule1'
-    Description: Enter the name of the value to import, empty value will not create rule
-  WAFManualBlacklistUserAgentRule1Action:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSqlInjectionProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component designed to block common SQL injection
-      attacks.
-  WAFSqlInjectionExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFSqlInjectionProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSqlInjectionExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFSqlInjectionExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the SQL injection rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFSqlInjectionExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFSqlInjectionExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFSqlInjectionExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFXssProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: Choose Yes to enable the component designed to block common XSS attacks.
-  WAFXssExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFXssProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFXssExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFXssExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the Xss rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFXssExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFXssExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFXssExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFSizeProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component designed to block common overflow
-      attacks in URI and Query String.
-  WAFSizeExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFSizeProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSizeURI1:
-    Type: String
-    Default: '512'
-    Description: Maximum size of the URI in bytes (maximum 8192).
-  WAFSizeQuery1:
-    Type: String
-    Default: '512'
-    Description: Maximum size of the query string in bytes (maximum 8192).
-  WAFSizeCookie1:
-    Type: String
-    Default: '4096'
-    Description: Maximum size of the cookie header in bytes (maximum 4096). The size is determined by the amount of information your web application stores in cookies. If you only pass a session token via cookies, set the size to no larger than the serialized size of the session token and cookie metadata.
-  WAFSizeExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFSizeExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the size limit rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFSizeExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFSizeExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH 
-  WAFSizeExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFBlacklistByteSet1ProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component to block generic byte match strings.
-  WAFBlacklistByteSet1ProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFBlacklistByteSet1Tuple1Type:
-    Type: String
-    Default: HEADER
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFBlacklistByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: 'pingback,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be denied in the byte set 1 rule, additions require updating the relevant byte set, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFBlacklistByteSet1Tuple1Transform:
-    Type: String
-    Default: LOWERCASE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFBlacklistByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFBlacklistByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: "General"
-        Parameters:
-          - WAFName
-          - WAFCloudWatchPrefix
-      - Label:
-          default: "Blacklists"
-        Parameters:
-          - WAFManualBlacklistIPRule1Name
-          - WAFManualBlacklistIPRule1Action
-          - WAFManualBlacklistIPSet1Name
-          - WAFManualBlacklistUserAgentRule1Name
-          - WAFManualBlacklistUserAgentRule1Action
-          - WAFUserAgentBlacklistRule1Name
-          - WAFUserAgentBlacklistSet1Name
-          - WAFUserAgentByteSet1Tuple1String
-          - WAFBlacklistByteSet1ProtectionParam
-          - WAFBlacklistByteSet1ProtectionAction
-          - WAFBlacklistByteSet1Tuple1Type
-          - WAFBlacklistByteSet1Tuple1String
-          - WAFBlacklistByteSet1Tuple1Transform
-          - WAFBlacklistByteSet1Tuple1Position
-          - WAFBlacklistByteSet1Tuple1Data
-      - Label:
-          default: "SQL Injection Protection"
-        Parameters:
-          - WAFSqlInjectionProtectionParam
-          - WAFSqlInjectionExceptionByteSet1Param
-          - WAFSqlInjectionProtectionAction
-          - WAFSqlInjectionExceptionByteSet1Tuple1Type
-          - WAFSqlInjectionExceptionByteSet1Tuple1String
-          - WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          - WAFSqlInjectionExceptionByteSet1Tuple1Position
-          - WAFSqlInjectionExceptionByteSet1Tuple1Data
-      - Label:
-          default: "Cross-Site Scripting Protection"
-        Parameters:
-          - WAFXssProtectionParam
-          - WAFXssExceptionByteSet1Param
-          - WAFXssProtectionAction
-          - WAFXssExceptionByteSet1Tuple1Type
-          - WAFXssExceptionByteSet1Tuple1String
-          - WAFXssExceptionByteSet1Tuple1Transform
-          - WAFXssExceptionByteSet1Tuple1Position
-          - WAFXssExceptionByteSet1Tuple1Data
-      - Label:
-          default: "Size Protection"
-        Parameters:
-          - WAFSizeProtectionParam
-          - WAFSizeExceptionByteSet1Param
-          - WAFSizeProtectionAction
-          - WAFSizeURI1
-          - WAFSizeQuery1
-          - WAFSizeCookie1
-          - WAFSizeExceptionByteSet1Tuple1Type
-          - WAFSizeExceptionByteSet1Tuple1String
-          - WAFSizeExceptionByteSet1Tuple1Transform
-          - WAFSizeExceptionByteSet1Tuple1Position
-          - WAFSizeExceptionByteSet1Tuple1Data
-Conditions:
-  WAFManualBlacklistIPRule1Activated: !Not
-    - !Equals 
-      - !Ref WAFManualBlacklistIPRule1Name
-      - ''
-  WAFManualBlacklistUserAgentRule1Activated: !Not
-    - !Equals 
-      - !Ref WAFManualBlacklistUserAgentRule1Name
-      - ''
-  WAFSqlInjectionProtectionActivated: !Equals
-    - !Ref WAFSqlInjectionProtectionParam
-    - 'Yes'
-  WAFSqlInjectionExceptionByteSet1Activated: !Equals
-    - !Ref WAFSqlInjectionExceptionByteSet1Param
-    - 'Yes'
-  WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFSizeProtectionActivated: !Equals
-    - !Ref WAFSizeProtectionParam
-    - 'Yes'
-  WAFSizeExceptionByteSet1Activated: !Equals
-    - !Ref WAFSizeExceptionByteSet1Param
-    - 'Yes'
-  WAFSizeExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFSizeExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFXssProtectionActivated: !Equals
-    - !Ref WAFXssProtectionParam
-    - 'Yes'
-  WAFXssExceptionByteSet1Activated: !Equals
-    - !Ref WAFXssExceptionByteSet1Param
-    - 'Yes'
-  WAFXssExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFXssExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFBlacklistByteSet1ProtectionActivated: !Equals
-    - !Ref WAFBlacklistByteSet1ProtectionParam
-    - 'Yes'
-  WAFBlacklistByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFBlacklistByteSet1Tuple1Type
-    - 'HEADER'
-
-Resources:
-  WAFManualBlacklistIPSet1:
-    Type: 'AWS::WAF::IPSet'
-    Properties:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPSet1Name}'
-  WAFUserAgentBlacklistSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Properties:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistSet1Name}'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['0', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['1', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['2', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['3', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['4', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['5', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['6', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['7', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['8', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['9', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-  WAFManualBlacklistIPRule1:
-    Type: 'AWS::WAF::Rule'
-    DependsOn: WAFManualBlacklistIPSet1
-    Properties:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPRule1Name}'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WAFManualBlacklistIPRule1Name'
-      Predicates:
-        - DataId: !Ref WAFManualBlacklistIPSet1
-          Negated: false
-          Type: IPMatch      
-  WAFUserAgentBlacklistRule1:
-    Type: 'AWS::WAF::Rule'
-    DependsOn: WAFUserAgentBlacklistSet1
-    Properties:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistRule1Name}'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WAFUserAgentBlacklistRule1Name'
-      Predicates:
-        - DataId: !Ref WAFUserAgentBlacklistSet1
-          Negated: false
-          Type: ByteMatch
-  WAFWhitelistIPSet1:
-    Type: 'AWS::WAF::IPSet'
-    Properties:
-      Name: !Sub '${WAFName}-WhitelistIPSet1'
-  WAFWhitelistIPRule1:
-    Type: 'AWS::WAF::Rule'
-    Properties:
-      Name: !Sub '${WAFName}-WhitelistRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WhitelistRule1'
-      Predicates:
-        - DataId: !Ref WAFWhitelistIPSet1
-          Negated: false
-          Type: IPMatch
-  WAFSqlInjectionDetectionSet1:
-    Type: 'AWS::WAF::SqlInjectionMatchSet'
-    Condition: WAFSqlInjectionProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SqlInjectionCondition1'
-      SqlInjectionMatchTuples:
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: HTML_ENTITY_DECODE
-  WAFSqlInjectionExceptionByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFSqlInjectionExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-SqlInjectionExceptionByteSet1'
-      ByteMatchTuples: 
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-  WAFSqlInjectionRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFSqlInjectionProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SQLiRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}SQLInjectionRule1'
-      Predicates:
-        - DataId: !Ref WAFSqlInjectionDetectionSet1
-          Negated: false
-          Type: SqlInjectionMatch
-        - !If
-          - WAFSqlInjectionExceptionByteSet1Activated
-          - DataId: !Ref WAFSqlInjectionExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFSizeDetectionSet1:
-    Type: 'AWS::WAF::SizeConstraintSet'
-    Condition: WAFSizeProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SizeCondition1'
-      SizeConstraints:
-        - FieldToMatch:
-            Type: QUERY_STRING
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeQuery1
-          TextTransformation: NONE
-        - FieldToMatch:
-            Type: URI
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeURI1
-          TextTransformation: NONE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: NONE
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeCookie1
-  WAFSizeExceptionByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFSizeExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-SizeExceptionByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-  WAFSizeRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFSizeProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SizeRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}SizeRule1'
-      Predicates:
-        - DataId: !Ref WAFSizeDetectionSet1
-          Negated: false
-          Type: SizeConstraint
-        - !If
-          - WAFSizeExceptionByteSet1Activated
-          - DataId: !Ref WAFSizeExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFXssDetectionSet1:
-    Type: 'AWS::WAF::XssMatchSet'
-    Condition: WAFXssProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-XSSCondition1'
-      XssMatchTuples:
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: HTML_ENTITY_DECODE
-  WAFXssExceptionByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFXssExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-XssExceptionByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-  WAFXssRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFXssProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-XSSRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}XssRule1'
-      Predicates:
-        - DataId: !Ref WAFXssDetectionSet1
-          Negated: false
-          Type: XssMatch
-        - !If
-          - WAFXssExceptionByteSet1Activated
-          - DataId: !Ref WAFXssExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFBlacklistByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFBlacklistByteSet1ProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-BlacklistByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-  WAFBlacklistByteRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFBlacklistByteSet1ProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-Blacklist1StringRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}BlacklistByteRule1'
-      Predicates:
-        - DataId: !Ref WAFBlacklistByteSet1
-          Negated: false
-          Type: ByteMatch
-  WAFWebACL:
-    Type: 'AWS::WAF::WebACL'
-    Properties:
-      Name: !Sub '${WAFName}-WebACL1'
-      DefaultAction:
-        Type: ALLOW
-      MetricName: !Sub '${WAFCloudWatchPrefix}WebACL1'
-      Rules:
-        - !If
-          - WAFManualBlacklistIPRule1Activated
-          - Action:
-              Type: !Ref WAFManualBlacklistIPRule1Action
-            Priority: 1
-            RuleId: !Ref WAFManualBlacklistIPRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFManualBlacklistUserAgentRule1Activated
-          - Action:
-              Type: !Ref WAFManualBlacklistUserAgentRule1Action
-            Priority: 3
-            RuleId: !Ref WAFBlacklistByteRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFSizeProtectionActivated
-          - Action:
-              Type: !Ref WAFSizeProtectionAction
-            Priority: 4
-            RuleId: !Ref WAFSizeRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFXssProtectionActivated
-          - Action:
-              Type: !Ref WAFXssProtectionAction
-            Priority: 5
-            RuleId: !Ref WAFXssRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFSqlInjectionProtectionActivated
-          - Action:
-              Type: !Ref WAFSqlInjectionProtectionAction
-            Priority: 6
-            RuleId: !Ref WAFSqlInjectionRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFBlacklistByteSet1ProtectionActivated
-          - Action:
-              Type: !Ref WAFBlacklistByteSet1ProtectionAction
-            Priority: 7
-            RuleId: !Ref WAFBlacklistByteRule1
-          - !Ref 'AWS::NoValue'
-
-Outputs:
-  WAFWebACL1ID:
-    Description: ID of WAF Web ACL 1
-    Value: !Ref WAFWebACL
-    Export:
-      Name: !Sub '${WAFName}-WebACL1'
-  WAFManualBlacklistIPRule1ID:
-    Description: ID of WAF Manual IP Blacklist Rule 1
-    Value: !Ref WAFManualBlacklistIPRule1
-    Export:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPRule1Name}'
-  WAFManualBlacklistIPSet1ID:
-    Description: ID of WAF Manual IP Blacklist Set 1
-    Value: !Ref WAFManualBlacklistIPSet1
-    Export:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPSet1Name}'
-  WAFUserAgentBlacklistRule1ID:
-    Description: ID of WAF User Agent Blacklist Rule 1
-    Value: !Ref WAFUserAgentBlacklistRule1
-    Export:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistRule1Name}'
-  WAFUserAgentBlacklistSet1ID:
-    Description: ID of WAF User Agent Blacklist Set 1
-    Value: !Ref WAFUserAgentBlacklistSet1
-    Export:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistSet1Name}'
-
diff --git a/static/Security/200_Automated_IAM_User_Cleanup/Code/cloudformation-iam-user-cleanup.yaml b/static/Security/200_Automated_IAM_User_Cleanup/Code/cloudformation-iam-user-cleanup.yaml
deleted file mode 100644
index 291e4b141..000000000
--- a/static/Security/200_Automated_IAM_User_Cleanup/Code/cloudformation-iam-user-cleanup.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform: AWS::Serverless-2016-10-31
-Description: >-
-  You will be billed for the AWS resources used if you create a stack from this
-  template.
-  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-Parameters:
-  NotificationEmail:
-    Type: String
-    AllowedPattern: (?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])
-    ConstraintDescription: Please enter a valid email.
-    Description: The email address to send the list of affected users.
-  MinAgeKeysToReport:
-    Type: Number
-    Default: 30
-    MinValue: 0
-    Description: The minimum age in days of access keys to include in the report.
-  MinAgeKeysToDisable:
-    Type: Number
-    Default: 0
-    MinValue: 0
-    Description: The minimum age in days of access keys to disable. Set to '0' to disable this function.
-  MinAgeKeysToDelete:
-    Type: Number
-    Default: 0
-    MinValue: 0
-    Description: The minimum age in days of access keys to delete. Set to '0' to disable this function.
-  MinAgeUnusedUsersToReport:
-    Type: Number
-    Default: 30
-    MinValue: 0
-    Description: The minimum age in days of unused users to include in the report.
-  MinAgeUnusedUsersToDisable:
-    Type: Number
-    Default: 0
-    Description: The minimum age in days of unused users to disable. Set to '0' to disable this function.
-  MinAgeUnusedUsersToDelete:
-    Type: Number
-    Default: 0
-    MinValue: 0
-    Description: The minimum age in days of unused users to delete. Set to '0' to disable this function.
-  MinAgeRolesToReport:
-    Type: Number
-    Default: 30
-    MinValue: 0
-    Description: The minimum age in days of unused users to include in the report.
-  MinAgeRolesToDisable:
-    Type: Number
-    Default: 0
-    Description: The minimum age in days of unused users to disable. Set to '0' to disable this function.
-  MinAgeRolesToDelete:
-    Type: Number
-    Default: 0
-    MinValue: 0
-    Description: The minimum age in days of unused users to delete. Set to '0' to disable this function.
-  AnalyzerType:
-    Type: String
-    AllowedValues: ['NONE','ACCOUNT','ORGANIZATION']
-    Default: 'ACCOUNT'
-    Description: IAM Access Analyzer produces findings on the external availability of resources within your AWS account. If this account is the root account of an organization or the delegated administrator select ORGANIZATION, otherwise select ACCOUNT or NONE to skip this check.
-Conditions:
-  CreateAnalyzer: !Not [!Equals [!Ref AnalyzerType, NONE]]
-Resources:
-  # SNS Topic
-  UserCleanupTopic:
-    Type: 'AWS::SNS::Topic'
-  UserCleanupSubscription:
-    Type: AWS::SNS::Subscription
-    Properties:
-      Endpoint: !Ref NotificationEmail
-      Protocol: email
-      TopicArn: !Ref UserCleanupTopic
-# IAM role required for Lambda to access IAM and to send the email from SNS
-  UserCleanupLambdaExecutionRole:
-      Type: 'AWS::IAM::Role'
-      Properties:
-        AssumeRolePolicyDocument:
-          Version: 2012-10-17
-          Statement:
-            Effect: Allow
-            Principal:
-              Service:
-                lambda.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-        Path: /
-        Policies:
-          - PolicyDocument:
-              Statement:
-                - Action:
-                    - 'logs:CreateLogGroup'
-                    - 'logs:CreateLogStream'
-                    - 'logs:PutLogEvents'
-                  Effect: Allow
-                  Resource: 'arn:aws:logs:*:*:*'
-                - Action:
-                    - 'iam:DeleteAccessKey'
-                    - 'iam:DeleteUser'
-                    - 'iam:GetAccessKeyLastUsed'
-                    - 'iam:GetUser'
-                    - 'iam:ListAccessKeys'
-                    - 'iam:ListUsers'
-                    - 'iam:UpdateAccessKey'
-                    - 'iam:UpdateUser'
-                    - 'iam:ListRoles'
-                    - 'iam:GenerateServiceLastAccessedDetails'
-                    - 'iam:GetServiceLastAccessedDetails'
-                    - 'iam:DeleteRole'
-                    - 'iam:AttachRolePolicy'
-                    - 'access-analyzer:ListFindings'
-                  Effect: Allow
-                  Resource: '*' # Explicit that this includes all users
-                - Action:
-                  - 'sns:Publish'
-                  Effect: Allow
-                  Resource: !Ref UserCleanupTopic
-              Version: 2012-10-17
-            PolicyName: sec-UserCleanupRole
-  # Lambda function to audit the credentials
-  UserCleanupLambda:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: lambda-iam-user-cleanup.lambda_handler
-      Runtime: python3.8
-      Role: !GetAtt UserCleanupLambdaExecutionRole.Arn
-      Environment:
-        Variables:
-          MinAgeKeysToReport: !Ref MinAgeKeysToReport
-          MinAgeKeysToDisable: !Ref MinAgeKeysToDisable
-          MinAgeKeysToDelete: !Ref MinAgeKeysToDelete
-          MinAgeUnusedUsersToReport: !Ref MinAgeUnusedUsersToReport
-          MinAgeUnusedUsersToDisable: !Ref MinAgeUnusedUsersToDisable
-          MinAgeUnusedUsersToDelete: !Ref MinAgeUnusedUsersToDelete
-          MinAgeRolesToReport: !Ref MinAgeRolesToReport
-          MinAgeRolesToDisable: !Ref MinAgeRolesToDisable
-          MinAgeRolesToDelete: !Ref MinAgeRolesToDelete
-          TopicTarget: !Ref UserCleanupTopic
-          CleanupAnalyzer: !If [CreateAnalyzer, !Ref CleanupAnalyzer, '']
-      CodeUri: lambda-iam-user-cleanup.py
-      Timeout: 300
-  # CloudWatch event to trigger this
-  UserCleanupTrigger:
-    Type: AWS::Events::Rule
-    Properties:
-      ScheduleExpression: 'cron(0 12 * * ? *)'
-      State: 'ENABLED'
-      Targets:
-        -
-          Arn: !GetAtt UserCleanupLambda.Arn
-          Id: 'LambdaTarget'
-  PermissionForEventsToInvokeLambda: 
-    Type: AWS::Lambda::Permission
-    Properties: 
-      FunctionName: !Ref UserCleanupLambda
-      Action: 'lambda:InvokeFunction'
-      Principal: 'events.amazonaws.com'
-      SourceArn: !GetAtt UserCleanupTrigger.Arn
-  # Access analyzer to look at accessability of resources external to organization or account
-  CleanupAnalyzer:
-    Condition: CreateAnalyzer
-    Type: AWS::AccessAnalyzer::Analyzer
-    Properties:
-      Type: !Ref AnalyzerType
diff --git a/static/Security/200_Basic_EC2_with_WAF_Protection/Code/waf-regional.yaml b/static/Security/200_Basic_EC2_with_WAF_Protection/Code/waf-regional.yaml
deleted file mode 100644
index d058bcee5..000000000
--- a/static/Security/200_Basic_EC2_with_WAF_Protection/Code/waf-regional.yaml
+++ /dev/null
@@ -1,1023 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS WAF example for an ALB. This AWS CloudFormation
-  template provisions WAF with basic rules for proof of concept.
-  **WARNING** You will be billed for the AWS resources created if you create a 
-  stack from this template.
-
-  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-
-Parameters:
-  WAFName:
-    Type: String
-    Default: 'WAFLabReg'
-    Description: Enter the base name to be used for resource and export names for this stack, eg WAF will create export names combined with the base name such as Lab1-ManualBlacklistIPRule1.
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MaxLength: 10
-  WAFCloudWatchPrefix:
-    Type: String
-    Default: 'WAFLabReg'
-    Description: Enter the name of the CloudWatch prefix to use for each rule, alphanumeric characters only
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MaxLength: 10
-  WAFManualBlacklistIPRule1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFManualBlacklistIPRule1 resource created.
-    Default: ManualBlacklistIPRule1R
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFManualBlacklistIPSet1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFManualBlacklistIPSet1 resource created.
-    Default: ManualBlacklistIPSet1R
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFUserAgentBlacklistRule1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFUserAgentBlacklistRule1 resource created.
-    Default: UserAgentBlacklistRule1R
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFUserAgentByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be included in the user-agent blacklist rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values. 
-  WAFUserAgentBlacklistSet1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFUserAgentBlacklistSet1 resource created.
-    Default: UserAgentBlacklistSet1R
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFManualBlacklistIPRule1Name:
-    Type: String
-    Default: 'ManualBlacklistIPRule1R'
-    Description: Enter the name of the value to import, empty value will not create rule
-  WAFManualBlacklistIPRule1Action:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFManualBlacklistUserAgentRule1Name:
-    Type: String
-    Default: 'UserAgentBlacklistRule1R'
-    Description: Enter the name of the value to import, empty value will not create rule
-  WAFManualBlacklistUserAgentRule1Action:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSqlInjectionProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component designed to block common SQL injection
-      attacks.
-  WAFSqlInjectionExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFSqlInjectionProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSqlInjectionExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFSqlInjectionExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the SQL injection rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFSqlInjectionExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFSqlInjectionExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFSqlInjectionExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFXssProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: Choose Yes to enable the component designed to block common XSS attacks.
-  WAFXssExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFXssProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFXssExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFXssExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the Xss rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFXssExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFXssExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFXssExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFSizeProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component designed to block common overflow
-      attacks in URI and Query String.
-  WAFSizeExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFSizeProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSizeURI1:
-    Type: String
-    Default: '512'
-    Description: Maximum size of the URI in bytes (maximum 8192).
-  WAFSizeQuery1:
-    Type: String
-    Default: '512'
-    Description: Maximum size of the query string in bytes (maximum 8192).
-  WAFSizeCookie1:
-    Type: String
-    Default: '4096'
-    Description: Maximum size of the cookie header in bytes (maximum 4096). The size is determined by the amount of information your web application stores in cookies. If you only pass a session token via cookies, set the size to no larger than the serialized size of the session token and cookie metadata.
-  WAFSizeExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFSizeExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the size limit rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFSizeExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFSizeExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH 
-  WAFSizeExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFBlacklistByteSet1ProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component to block generic byte match strings.
-  WAFBlacklistByteSet1ProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFBlacklistByteSet1Tuple1Type:
-    Type: String
-    Default: HEADER
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFBlacklistByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: 'pingback,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be denied in the byte set 1 rule, additions require updating the relevant byte set, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFBlacklistByteSet1Tuple1Transform:
-    Type: String
-    Default: LOWERCASE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFBlacklistByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFBlacklistByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: "General"
-        Parameters:
-          - WAFName
-          - WAFCloudWatchPrefix
-      - Label:
-          default: "Blacklists"
-        Parameters:
-          - WAFManualBlacklistIPRule1Name
-          - WAFManualBlacklistIPRule1Action
-          - WAFManualBlacklistIPSet1Name
-          - WAFManualBlacklistUserAgentRule1Name
-          - WAFManualBlacklistUserAgentRule1Action
-          - WAFUserAgentBlacklistRule1Name
-          - WAFUserAgentBlacklistSet1Name
-          - WAFUserAgentByteSet1Tuple1String
-          - WAFBlacklistByteSet1ProtectionParam
-          - WAFBlacklistByteSet1ProtectionAction
-          - WAFBlacklistByteSet1Tuple1Type
-          - WAFBlacklistByteSet1Tuple1String
-          - WAFBlacklistByteSet1Tuple1Transform
-          - WAFBlacklistByteSet1Tuple1Position
-          - WAFBlacklistByteSet1Tuple1Data
-      - Label:
-          default: "SQL Injection Protection"
-        Parameters:
-          - WAFSqlInjectionProtectionParam
-          - WAFSqlInjectionExceptionByteSet1Param
-          - WAFSqlInjectionProtectionAction
-          - WAFSqlInjectionExceptionByteSet1Tuple1Type
-          - WAFSqlInjectionExceptionByteSet1Tuple1String
-          - WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          - WAFSqlInjectionExceptionByteSet1Tuple1Position
-          - WAFSqlInjectionExceptionByteSet1Tuple1Data
-      - Label:
-          default: "Cross-Site Scripting Protection"
-        Parameters:
-          - WAFXssProtectionParam
-          - WAFXssExceptionByteSet1Param
-          - WAFXssProtectionAction
-          - WAFXssExceptionByteSet1Tuple1Type
-          - WAFXssExceptionByteSet1Tuple1String
-          - WAFXssExceptionByteSet1Tuple1Transform
-          - WAFXssExceptionByteSet1Tuple1Position
-          - WAFXssExceptionByteSet1Tuple1Data
-      - Label:
-          default: "Size Protection"
-        Parameters:
-          - WAFSizeProtectionParam
-          - WAFSizeExceptionByteSet1Param
-          - WAFSizeProtectionAction
-          - WAFSizeURI1
-          - WAFSizeQuery1
-          - WAFSizeCookie1
-          - WAFSizeExceptionByteSet1Tuple1Type
-          - WAFSizeExceptionByteSet1Tuple1String
-          - WAFSizeExceptionByteSet1Tuple1Transform
-          - WAFSizeExceptionByteSet1Tuple1Position
-          - WAFSizeExceptionByteSet1Tuple1Data
-Conditions:
-  WAFManualBlacklistIPRule1Activated: !Not
-    - !Equals 
-      - !Ref WAFManualBlacklistIPRule1Name
-      - ''
-  WAFManualBlacklistUserAgentRule1Activated: !Not
-    - !Equals 
-      - !Ref WAFManualBlacklistUserAgentRule1Name
-      - ''
-  WAFSqlInjectionProtectionActivated: !Equals
-    - !Ref WAFSqlInjectionProtectionParam
-    - 'Yes'
-  WAFSqlInjectionExceptionByteSet1Activated: !Equals
-    - !Ref WAFSqlInjectionExceptionByteSet1Param
-    - 'Yes'
-  WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFSizeProtectionActivated: !Equals
-    - !Ref WAFSizeProtectionParam
-    - 'Yes'
-  WAFSizeExceptionByteSet1Activated: !Equals
-    - !Ref WAFSizeExceptionByteSet1Param
-    - 'Yes'
-  WAFSizeExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFSizeExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFXssProtectionActivated: !Equals
-    - !Ref WAFXssProtectionParam
-    - 'Yes'
-  WAFXssExceptionByteSet1Activated: !Equals
-    - !Ref WAFXssExceptionByteSet1Param
-    - 'Yes'
-  WAFXssExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFXssExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFBlacklistByteSet1ProtectionActivated: !Equals
-    - !Ref WAFBlacklistByteSet1ProtectionParam
-    - 'Yes'
-  WAFBlacklistByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFBlacklistByteSet1Tuple1Type
-    - 'HEADER'
-
-Resources:
-  WAFManualBlacklistIPSet1:
-    Type: 'AWS::WAFRegional::IPSet'
-    Properties:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPSet1Name}'
-  WAFUserAgentBlacklistSet1:
-    Type: 'AWS::WAFRegional::ByteMatchSet'
-    Properties:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistSet1Name}'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['0', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['1', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['2', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['3', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['4', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['5', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['6', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['7', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['8', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['9', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-  WAFManualBlacklistIPRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    DependsOn: WAFManualBlacklistIPSet1
-    Properties:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPRule1Name}'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WAFManualBlacklistIPRule1Name'
-      Predicates:
-        - DataId: !Ref WAFManualBlacklistIPSet1
-          Negated: false
-          Type: IPMatch      
-  WAFUserAgentBlacklistRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    DependsOn: WAFUserAgentBlacklistSet1
-    Properties:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistRule1Name}'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WAFUserAgentBlacklistRule1Name'
-      Predicates:
-        - DataId: !Ref WAFUserAgentBlacklistSet1
-          Negated: false
-          Type: ByteMatch
-  WAFWhitelistIPSet1:
-    Type: 'AWS::WAFRegional::IPSet'
-    Properties:
-      Name: !Sub '${WAFName}-WhitelistIPSet1'
-  WAFWhitelistIPRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    Properties:
-      Name: !Sub '${WAFName}-WhitelistRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WhitelistRule1'
-      Predicates:
-        - DataId: !Ref WAFWhitelistIPSet1
-          Negated: false
-          Type: IPMatch
-  WAFSqlInjectionDetectionSet1:
-    Type: 'AWS::WAFRegional::SqlInjectionMatchSet'
-    Condition: WAFSqlInjectionProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SqlInjectionCondition1'
-      SqlInjectionMatchTuples:
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: HTML_ENTITY_DECODE
-  WAFSqlInjectionExceptionByteSet1:
-    Type: 'AWS::WAFRegional::ByteMatchSet'
-    Condition: WAFSqlInjectionExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-SqlInjectionExceptionByteSet1'
-      ByteMatchTuples: 
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-  WAFSqlInjectionRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    Condition: WAFSqlInjectionProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SQLiRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}SQLInjectionRule1'
-      Predicates:
-        - DataId: !Ref WAFSqlInjectionDetectionSet1
-          Negated: false
-          Type: SqlInjectionMatch
-        - !If
-          - WAFSqlInjectionExceptionByteSet1Activated
-          - DataId: !Ref WAFSqlInjectionExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFSizeDetectionSet1:
-    Type: 'AWS::WAFRegional::SizeConstraintSet'
-    Condition: WAFSizeProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SizeCondition1'
-      SizeConstraints:
-        - FieldToMatch:
-            Type: QUERY_STRING
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeQuery1
-          TextTransformation: NONE
-        - FieldToMatch:
-            Type: URI
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeURI1
-          TextTransformation: NONE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: NONE
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeCookie1
-  WAFSizeExceptionByteSet1:
-    Type: 'AWS::WAFRegional::ByteMatchSet'
-    Condition: WAFSizeExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-SizeExceptionByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-  WAFSizeRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    Condition: WAFSizeProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SizeRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}SizeRule1'
-      Predicates:
-        - DataId: !Ref WAFSizeDetectionSet1
-          Negated: false
-          Type: SizeConstraint
-        - !If
-          - WAFSizeExceptionByteSet1Activated
-          - DataId: !Ref WAFSizeExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFXssDetectionSet1:
-    Type: 'AWS::WAFRegional::XssMatchSet'
-    Condition: WAFXssProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-XSSCondition1'
-      XssMatchTuples:
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: HTML_ENTITY_DECODE
-  WAFXssExceptionByteSet1:
-    Type: 'AWS::WAFRegional::ByteMatchSet'
-    Condition: WAFXssExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-XssExceptionByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-  WAFXssRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    Condition: WAFXssProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-XSSRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}XssRule1'
-      Predicates:
-        - DataId: !Ref WAFXssDetectionSet1
-          Negated: false
-          Type: XssMatch
-        - !If
-          - WAFXssExceptionByteSet1Activated
-          - DataId: !Ref WAFXssExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFBlacklistByteSet1:
-    Type: 'AWS::WAFRegional::ByteMatchSet'
-    Condition: WAFBlacklistByteSet1ProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-BlacklistByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-  WAFBlacklistByteRule1:
-    Type: 'AWS::WAFRegional::Rule'
-    Condition: WAFBlacklistByteSet1ProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-Blacklist1StringRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}BlacklistByteRule1'
-      Predicates:
-        - DataId: !Ref WAFBlacklistByteSet1
-          Negated: false
-          Type: ByteMatch
-  WAFWebACL:
-    Type: 'AWS::WAFRegional::WebACL'
-    Properties:
-      Name: !Sub '${WAFName}-WebACL1'
-      DefaultAction:
-        Type: ALLOW
-      MetricName: !Sub '${WAFCloudWatchPrefix}WebACL1'
-      Rules:
-        - !If
-          - WAFManualBlacklistIPRule1Activated
-          - Action:
-              Type: !Ref WAFManualBlacklistIPRule1Action
-            Priority: 1
-            RuleId: !Ref WAFManualBlacklistIPRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFManualBlacklistUserAgentRule1Activated
-          - Action:
-              Type: !Ref WAFManualBlacklistUserAgentRule1Action
-            Priority: 3
-            RuleId: !Ref WAFBlacklistByteRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFSizeProtectionActivated
-          - Action:
-              Type: !Ref WAFSizeProtectionAction
-            Priority: 4
-            RuleId: !Ref WAFSizeRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFXssProtectionActivated
-          - Action:
-              Type: !Ref WAFXssProtectionAction
-            Priority: 5
-            RuleId: !Ref WAFXssRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFSqlInjectionProtectionActivated
-          - Action:
-              Type: !Ref WAFSqlInjectionProtectionAction
-            Priority: 6
-            RuleId: !Ref WAFSqlInjectionRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFBlacklistByteSet1ProtectionActivated
-          - Action:
-              Type: !Ref WAFBlacklistByteSet1ProtectionAction
-            Priority: 7
-            RuleId: !Ref WAFBlacklistByteRule1
-          - !Ref 'AWS::NoValue'
-
-Outputs:
-  WAFWebACL1ID:
-    Description: ID of WAF Web ACL 1
-    Value: !Ref WAFWebACL
-    Export:
-      Name: !Sub '${WAFName}-WebACL1'
-  WAFManualBlacklistIPRule1ID:
-    Description: ID of WAF Manual IP Blacklist Rule 1
-    Value: !Ref WAFManualBlacklistIPRule1
-    Export:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPRule1Name}'
-  WAFManualBlacklistIPSet1ID:
-    Description: ID of WAF Manual IP Blacklist Set 1
-    Value: !Ref WAFManualBlacklistIPSet1
-    Export:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPSet1Name}'
-  WAFUserAgentBlacklistRule1ID:
-    Description: ID of WAF User Agent Blacklist Rule 1
-    Value: !Ref WAFUserAgentBlacklistRule1
-    Export:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistRule1Name}'
-  WAFUserAgentBlacklistSet1ID:
-    Description: ID of WAF User Agent Blacklist Set 1
-    Value: !Ref WAFUserAgentBlacklistSet1
-    Export:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistSet1Name}'
-
diff --git a/static/Security/200_CloudFront_with_WAF_Protection/Code/waf-global.yaml b/static/Security/200_CloudFront_with_WAF_Protection/Code/waf-global.yaml
deleted file mode 100644
index bcc0067b8..000000000
--- a/static/Security/200_CloudFront_with_WAF_Protection/Code/waf-global.yaml
+++ /dev/null
@@ -1,1023 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS WAF example for CloudFront. This AWS CloudFormation
-  template provisions WAF with basic rules for proof of concept.
-  **WARNING** You will be billed for the AWS resources created if you create a 
-  stack from this template.
-
-  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  A copy of the License is located at
-  
-      https://www.apache.org/licenses/LICENSE-2.0
-  
-  or in the "license" file accompanying this file. This file is distributed 
-  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-  express or implied. See the License for the specific language governing 
-  permissions and limitations under the License.
-
-Parameters:
-  WAFName:
-    Type: String
-    Default: 'Lab1'
-    Description: Enter the base name to be used for resource and export names for this stack, eg WAF will create export names combined with the base name such as Lab1-ManualBlacklistIPRule1.
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MaxLength: 10
-  WAFCloudWatchPrefix:
-    Type: String
-    Default: 'Lab1'
-    Description: Enter the name of the CloudWatch prefix to use for each rule, alphanumeric characters only
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MaxLength: 10
-  WAFManualBlacklistIPRule1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFManualBlacklistIPRule1 resource created.
-    Default: ManualBlacklistIPRule1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFManualBlacklistIPSet1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFManualBlacklistIPSet1 resource created.
-    Default: ManualBlacklistIPSet1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFUserAgentBlacklistRule1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFUserAgentBlacklistRule1 resource created.
-    Default: UserAgentBlacklistRule1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFUserAgentByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be included in the user-agent blacklist rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values. 
-  WAFUserAgentBlacklistSet1Name:
-    Type: String
-    Description: The CloudFormation resource name of the WAFUserAgentBlacklistSet1 resource created.
-    Default: UserAgentBlacklistSet1
-    AllowedPattern: ^[a-zA-z0-9]+$
-    MinLength: '3'
-    MaxLength: '32'
-  WAFManualBlacklistIPRule1Name:
-    Type: String
-    Default: 'ManualBlacklistIPRule1'
-    Description: Enter the name of the value to import, empty value will not create rule
-  WAFManualBlacklistIPRule1Action:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFManualBlacklistUserAgentRule1Name:
-    Type: String
-    Default: 'UserAgentBlacklistRule1'
-    Description: Enter the name of the value to import, empty value will not create rule
-  WAFManualBlacklistUserAgentRule1Action:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSqlInjectionProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component designed to block common SQL injection
-      attacks.
-  WAFSqlInjectionExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFSqlInjectionProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSqlInjectionExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFSqlInjectionExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the SQL injection rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFSqlInjectionExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFSqlInjectionExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFSqlInjectionExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFXssProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: Choose Yes to enable the component designed to block common XSS attacks.
-  WAFXssExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFXssProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFXssExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFXssExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the Xss rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFXssExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFXssExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFXssExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFSizeProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component designed to block common overflow
-      attacks in URI and Query String.
-  WAFSizeExceptionByteSet1Param:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-  WAFSizeProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFSizeURI1:
-    Type: String
-    Default: '512'
-    Description: Maximum size of the URI in bytes (maximum 8192).
-  WAFSizeQuery1:
-    Type: String
-    Default: '512'
-    Description: Maximum size of the query string in bytes (maximum 8192).
-  WAFSizeCookie1:
-    Type: String
-    Default: '4096'
-    Description: Maximum size of the cookie header in bytes (maximum 4096). The size is determined by the amount of information your web application stores in cookies. If you only pass a session token via cookies, set the size to no larger than the serialized size of the session token and cookie metadata.
-  WAFSizeExceptionByteSet1Tuple1Type:
-    Type: String
-    Default: URI
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFSizeExceptionByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: '/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be excluded from the size limit rule, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFSizeExceptionByteSet1Tuple1Transform:
-    Type: String
-    Default: NONE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFSizeExceptionByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH 
-  WAFSizeExceptionByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-  WAFBlacklistByteSet1ProtectionParam:
-    Type: String
-    Default: 'Yes'
-    AllowedValues:
-      - 'Yes'
-      - 'No'
-    Description: >-
-      Choose Yes to enable the component to block generic byte match strings.
-  WAFBlacklistByteSet1ProtectionAction:
-    Type: String
-    Default: 'COUNT'
-    AllowedValues:
-      - 'COUNT'
-      - 'BLOCK'
-  WAFBlacklistByteSet1Tuple1Type:
-    Type: String
-    Default: HEADER
-    Description: ''
-    AllowedValues:
-      - HEADER
-      - METHOD
-      - QUERY_STRING
-      - URI
-      - BODY
-  WAFBlacklistByteSet1Tuple1String:
-    Type: CommaDelimitedList
-    Default: 'pingback,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,/aaabbbccc111222333,'
-    Description: Enter the string that will be denied in the byte set 1 rule, additions require updating the relevant byte set, rename the example padding where necessary and ensure there is a total of 10 comma separate values.
-  WAFBlacklistByteSet1Tuple1Transform:
-    Type: String
-    Default: LOWERCASE
-    Description: ''
-    AllowedValues:
-      - CMD_LINE
-      - COMPRESS_WHITE_SPACE
-      - HTML_ENTITY_DECODE
-      - LOWERCASE
-      - URL_DECODE
-      - NONE
-  WAFBlacklistByteSet1Tuple1Position:
-    Type: String
-    Default: CONTAINS
-    Description: ''
-    AllowedValues:
-      - CONTAINS
-      - CONTAINS_WORD
-      - EXACTLY
-      - STARTS_WITH
-      - ENDS_WITH
-  WAFBlacklistByteSet1Tuple1Data:
-    Type: String
-    Default: 'User-Agent'
-    Description: 'Value of byte match type if set to HEADER'
-
-Metadata:
-  AWS::CloudFormation::Interface:
-    ParameterGroups:
-      - Label:
-          default: "General"
-        Parameters:
-          - WAFName
-          - WAFCloudWatchPrefix
-      - Label:
-          default: "Blacklists"
-        Parameters:
-          - WAFManualBlacklistIPRule1Name
-          - WAFManualBlacklistIPRule1Action
-          - WAFManualBlacklistIPSet1Name
-          - WAFManualBlacklistUserAgentRule1Name
-          - WAFManualBlacklistUserAgentRule1Action
-          - WAFUserAgentBlacklistRule1Name
-          - WAFUserAgentBlacklistSet1Name
-          - WAFUserAgentByteSet1Tuple1String
-          - WAFBlacklistByteSet1ProtectionParam
-          - WAFBlacklistByteSet1ProtectionAction
-          - WAFBlacklistByteSet1Tuple1Type
-          - WAFBlacklistByteSet1Tuple1String
-          - WAFBlacklistByteSet1Tuple1Transform
-          - WAFBlacklistByteSet1Tuple1Position
-          - WAFBlacklistByteSet1Tuple1Data
-      - Label:
-          default: "SQL Injection Protection"
-        Parameters:
-          - WAFSqlInjectionProtectionParam
-          - WAFSqlInjectionExceptionByteSet1Param
-          - WAFSqlInjectionProtectionAction
-          - WAFSqlInjectionExceptionByteSet1Tuple1Type
-          - WAFSqlInjectionExceptionByteSet1Tuple1String
-          - WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          - WAFSqlInjectionExceptionByteSet1Tuple1Position
-          - WAFSqlInjectionExceptionByteSet1Tuple1Data
-      - Label:
-          default: "Cross-Site Scripting Protection"
-        Parameters:
-          - WAFXssProtectionParam
-          - WAFXssExceptionByteSet1Param
-          - WAFXssProtectionAction
-          - WAFXssExceptionByteSet1Tuple1Type
-          - WAFXssExceptionByteSet1Tuple1String
-          - WAFXssExceptionByteSet1Tuple1Transform
-          - WAFXssExceptionByteSet1Tuple1Position
-          - WAFXssExceptionByteSet1Tuple1Data
-      - Label:
-          default: "Size Protection"
-        Parameters:
-          - WAFSizeProtectionParam
-          - WAFSizeExceptionByteSet1Param
-          - WAFSizeProtectionAction
-          - WAFSizeURI1
-          - WAFSizeQuery1
-          - WAFSizeCookie1
-          - WAFSizeExceptionByteSet1Tuple1Type
-          - WAFSizeExceptionByteSet1Tuple1String
-          - WAFSizeExceptionByteSet1Tuple1Transform
-          - WAFSizeExceptionByteSet1Tuple1Position
-          - WAFSizeExceptionByteSet1Tuple1Data
-Conditions:
-  WAFManualBlacklistIPRule1Activated: !Not
-    - !Equals 
-      - !Ref WAFManualBlacklistIPRule1Name
-      - ''
-  WAFManualBlacklistUserAgentRule1Activated: !Not
-    - !Equals 
-      - !Ref WAFManualBlacklistUserAgentRule1Name
-      - ''
-  WAFSqlInjectionProtectionActivated: !Equals
-    - !Ref WAFSqlInjectionProtectionParam
-    - 'Yes'
-  WAFSqlInjectionExceptionByteSet1Activated: !Equals
-    - !Ref WAFSqlInjectionExceptionByteSet1Param
-    - 'Yes'
-  WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFSizeProtectionActivated: !Equals
-    - !Ref WAFSizeProtectionParam
-    - 'Yes'
-  WAFSizeExceptionByteSet1Activated: !Equals
-    - !Ref WAFSizeExceptionByteSet1Param
-    - 'Yes'
-  WAFSizeExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFSizeExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFXssProtectionActivated: !Equals
-    - !Ref WAFXssProtectionParam
-    - 'Yes'
-  WAFXssExceptionByteSet1Activated: !Equals
-    - !Ref WAFXssExceptionByteSet1Param
-    - 'Yes'
-  WAFXssExceptionByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFXssExceptionByteSet1Tuple1Type
-    - 'HEADER'
-  WAFBlacklistByteSet1ProtectionActivated: !Equals
-    - !Ref WAFBlacklistByteSet1ProtectionParam
-    - 'Yes'
-  WAFBlacklistByteSet1Tuple1TypeHeader: !Equals
-    - !Ref WAFBlacklistByteSet1Tuple1Type
-    - 'HEADER'
-
-Resources:
-  WAFManualBlacklistIPSet1:
-    Type: 'AWS::WAF::IPSet'
-    Properties:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPSet1Name}'
-  WAFUserAgentBlacklistSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Properties:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistSet1Name}'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['0', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['1', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['2', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['3', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['4', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['5', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['6', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['7', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['8', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-        - FieldToMatch:
-            Type: HEADER
-            Data: User-Agent
-          TargetString: !Select ['9', !Ref 'WAFUserAgentByteSet1Tuple1String']
-          TextTransformation: CMD_LINE
-          PositionalConstraint: CONTAINS
-  WAFManualBlacklistIPRule1:
-    Type: 'AWS::WAF::Rule'
-    DependsOn: WAFManualBlacklistIPSet1
-    Properties:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPRule1Name}'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WAFManualBlacklistIPRule1Name'
-      Predicates:
-        - DataId: !Ref WAFManualBlacklistIPSet1
-          Negated: false
-          Type: IPMatch      
-  WAFUserAgentBlacklistRule1:
-    Type: 'AWS::WAF::Rule'
-    DependsOn: WAFUserAgentBlacklistSet1
-    Properties:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistRule1Name}'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WAFUserAgentBlacklistRule1Name'
-      Predicates:
-        - DataId: !Ref WAFUserAgentBlacklistSet1
-          Negated: false
-          Type: ByteMatch
-  WAFWhitelistIPSet1:
-    Type: 'AWS::WAF::IPSet'
-    Properties:
-      Name: !Sub '${WAFName}-WhitelistIPSet1'
-  WAFWhitelistIPRule1:
-    Type: 'AWS::WAF::Rule'
-    Properties:
-      Name: !Sub '${WAFName}-WhitelistRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}WhitelistRule1'
-      Predicates:
-        - DataId: !Ref WAFWhitelistIPSet1
-          Negated: false
-          Type: IPMatch
-  WAFSqlInjectionDetectionSet1:
-    Type: 'AWS::WAF::SqlInjectionMatchSet'
-    Condition: WAFSqlInjectionProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SqlInjectionCondition1'
-      SqlInjectionMatchTuples:
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: HTML_ENTITY_DECODE
-  WAFSqlInjectionExceptionByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFSqlInjectionExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-SqlInjectionExceptionByteSet1'
-      ByteMatchTuples: 
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Type
-            Data: !If [WAFSqlInjectionExceptionByteSet1Tuple1TypeHeader, !Ref WAFSqlInjectionExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFSqlInjectionExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSqlInjectionExceptionByteSet1Tuple1Position
-  WAFSqlInjectionRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFSqlInjectionProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SQLiRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}SQLInjectionRule1'
-      Predicates:
-        - DataId: !Ref WAFSqlInjectionDetectionSet1
-          Negated: false
-          Type: SqlInjectionMatch
-        - !If
-          - WAFSqlInjectionExceptionByteSet1Activated
-          - DataId: !Ref WAFSqlInjectionExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFSizeDetectionSet1:
-    Type: 'AWS::WAF::SizeConstraintSet'
-    Condition: WAFSizeProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SizeCondition1'
-      SizeConstraints:
-        - FieldToMatch:
-            Type: QUERY_STRING
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeQuery1
-          TextTransformation: NONE
-        - FieldToMatch:
-            Type: URI
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeURI1
-          TextTransformation: NONE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: NONE
-          ComparisonOperator: GT
-          Size: !Ref WAFSizeCookie1
-  WAFSizeExceptionByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFSizeExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-SizeExceptionByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFSizeExceptionByteSet1Tuple1Type
-            Data: !If [WAFSizeExceptionByteSet1Tuple1TypeHeader, !Ref WAFSizeExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFSizeExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFSizeExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFSizeExceptionByteSet1Tuple1Position
-  WAFSizeRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFSizeProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-SizeRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}SizeRule1'
-      Predicates:
-        - DataId: !Ref WAFSizeDetectionSet1
-          Negated: false
-          Type: SizeConstraint
-        - !If
-          - WAFSizeExceptionByteSet1Activated
-          - DataId: !Ref WAFSizeExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFXssDetectionSet1:
-    Type: 'AWS::WAF::XssMatchSet'
-    Condition: WAFXssProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-XSSCondition1'
-      XssMatchTuples:
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: URI
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: QUERY_STRING
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: BODY
-          TextTransformation: HTML_ENTITY_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: URL_DECODE
-        - FieldToMatch:
-            Type: HEADER
-            Data: cookie
-          TextTransformation: HTML_ENTITY_DECODE
-  WAFXssExceptionByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFXssExceptionByteSet1Activated
-    Properties:
-      Name: !Sub '${WAFName}-XssExceptionByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFXssExceptionByteSet1Tuple1Type
-            Data: !If [WAFXssExceptionByteSet1Tuple1TypeHeader, !Ref WAFXssExceptionByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFXssExceptionByteSet1Tuple1String']
-          TextTransformation: !Ref WAFXssExceptionByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFXssExceptionByteSet1Tuple1Position
-  WAFXssRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFXssProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-XSSRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}XssRule1'
-      Predicates:
-        - DataId: !Ref WAFXssDetectionSet1
-          Negated: false
-          Type: XssMatch
-        - !If
-          - WAFXssExceptionByteSet1Activated
-          - DataId: !Ref WAFXssExceptionByteSet1
-            Negated: true
-            Type: ByteMatch
-          - !Ref 'AWS::NoValue'
-  WAFBlacklistByteSet1:
-    Type: 'AWS::WAF::ByteMatchSet'
-    Condition: WAFBlacklistByteSet1ProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-BlacklistByteSet1'
-      ByteMatchTuples:
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['0', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['1', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['2', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['3', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['4', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['5', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['6', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['7', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['8', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-        - FieldToMatch:
-            Type: !Ref WAFBlacklistByteSet1Tuple1Type
-            Data: !If [WAFBlacklistByteSet1Tuple1TypeHeader, !Ref WAFBlacklistByteSet1Tuple1Data, !Ref 'AWS::NoValue']
-          TargetString: !Select ['9', !Ref 'WAFBlacklistByteSet1Tuple1String']
-          TextTransformation: !Ref WAFBlacklistByteSet1Tuple1Transform
-          PositionalConstraint: !Ref WAFBlacklistByteSet1Tuple1Position
-  WAFBlacklistByteRule1:
-    Type: 'AWS::WAF::Rule'
-    Condition: WAFBlacklistByteSet1ProtectionActivated
-    Properties:
-      Name: !Sub '${WAFName}-Blacklist1StringRule1'
-      MetricName: !Sub '${WAFCloudWatchPrefix}BlacklistByteRule1'
-      Predicates:
-        - DataId: !Ref WAFBlacklistByteSet1
-          Negated: false
-          Type: ByteMatch
-  WAFWebACL:
-    Type: 'AWS::WAF::WebACL'
-    Properties:
-      Name: !Sub '${WAFName}-WebACL1'
-      DefaultAction:
-        Type: ALLOW
-      MetricName: !Sub '${WAFCloudWatchPrefix}WebACL1'
-      Rules:
-        - !If
-          - WAFManualBlacklistIPRule1Activated
-          - Action:
-              Type: !Ref WAFManualBlacklistIPRule1Action
-            Priority: 1
-            RuleId: !Ref WAFManualBlacklistIPRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFManualBlacklistUserAgentRule1Activated
-          - Action:
-              Type: !Ref WAFManualBlacklistUserAgentRule1Action
-            Priority: 3
-            RuleId: !Ref WAFBlacklistByteRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFSizeProtectionActivated
-          - Action:
-              Type: !Ref WAFSizeProtectionAction
-            Priority: 4
-            RuleId: !Ref WAFSizeRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFXssProtectionActivated
-          - Action:
-              Type: !Ref WAFXssProtectionAction
-            Priority: 5
-            RuleId: !Ref WAFXssRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFSqlInjectionProtectionActivated
-          - Action:
-              Type: !Ref WAFSqlInjectionProtectionAction
-            Priority: 6
-            RuleId: !Ref WAFSqlInjectionRule1
-          - !Ref 'AWS::NoValue'
-        - !If
-          - WAFBlacklistByteSet1ProtectionActivated
-          - Action:
-              Type: !Ref WAFBlacklistByteSet1ProtectionAction
-            Priority: 7
-            RuleId: !Ref WAFBlacklistByteRule1
-          - !Ref 'AWS::NoValue'
-
-Outputs:
-  WAFWebACL1ID:
-    Description: ID of WAF Web ACL 1
-    Value: !Ref WAFWebACL
-    Export:
-      Name: !Sub '${WAFName}-WebACL1'
-  WAFManualBlacklistIPRule1ID:
-    Description: ID of WAF Manual IP Blacklist Rule 1
-    Value: !Ref WAFManualBlacklistIPRule1
-    Export:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPRule1Name}'
-  WAFManualBlacklistIPSet1ID:
-    Description: ID of WAF Manual IP Blacklist Set 1
-    Value: !Ref WAFManualBlacklistIPSet1
-    Export:
-      Name: !Sub '${WAFName}-${WAFManualBlacklistIPSet1Name}'
-  WAFUserAgentBlacklistRule1ID:
-    Description: ID of WAF User Agent Blacklist Rule 1
-    Value: !Ref WAFUserAgentBlacklistRule1
-    Export:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistRule1Name}'
-  WAFUserAgentBlacklistSet1ID:
-    Description: ID of WAF User Agent Blacklist Set 1
-    Value: !Ref WAFUserAgentBlacklistSet1
-    Export:
-      Name: !Sub '${WAFName}-${WAFUserAgentBlacklistSet1Name}'
-
diff --git a/static/Security/200_Remote_Configuration_Installation_and_Viewing_CloudWatch_Logs/code/security-lab-stack.yaml b/static/Security/200_Remote_Configuration_Installation_and_Viewing_CloudWatch_Logs/code/security-lab-stack.yaml
deleted file mode 100644
index f1d4bbeae..000000000
--- a/static/Security/200_Remote_Configuration_Installation_and_Viewing_CloudWatch_Logs/code/security-lab-stack.yaml
+++ /dev/null
@@ -1,294 +0,0 @@
-# Creator: Pavan Baloo
-# Date Created: 07/10/2020
-# Date Last Modified: 07/10/2020
-# Creates a PHP web application hosted on Apache Web Server
-
-# This is the only valid template version
-AWSTemplateFormatVersion: "2010-09-09"
-
-# Tester template for CFN practice
-Description: Testing a basic CFN template
-      
-# Parameters used: InstanceType, DisplayedName, LatestAmiId
-Parameters: 
-  
-  # Uses public Systems Manager Parameter for latest AMI
-  LatestAmiId:
-    Type: AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>
-    Default: '/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2'
-  
-  # DisplayedName: String to be displayed on sample web page
-  DisplayedName: 
-    Description: Name displayed on web page
-    Type: String
-    Default: Pavan
-    AllowedPattern: "[a-zA-Z]*"
-  
-  # BucketName: Name of S3 bucket for CW Logs
-  BucketName:
-    Type: String
-    AllowedPattern: ^[0-9a-zA-Z]+([0-9a-zA-Z-.]*[0-9a-zA-Z])*$
-    ConstraintDescription: Bucket name can include numbers, lowercase letters, uppercase letters, periods (.), and hyphens (-). It cannot start or end with a hyphen (-).
-    Description: S3 bucket for log files
-
-
-Resources:
-
-  # EC2 instance for webserver
-  EC2Instance: 
-    Type: AWS::EC2::Instance
-    # EC2 instance metadata
-    Metadata:
-      # Used to include EC2 metadata for cfn-init helper script
-      'AWS::CloudFormation::Init':
-        # configset for this cfn
-        config:
-          # install HTTPD (apache web server) and PHP for this instance using yum
-          packages:
-            yum:
-              httpd: []
-              php: []
-          # creates a file in tmp called test.php that is a simple "hello world"
-          files:
-            /var/www/html/index.php:
-              content: !Join 
-                - ''
-                - - |
-                    <?php
-                  - |
-                    echo '<h1>This website is made by     
-                  - !Ref DisplayedName
-                  -  </h1>';
-                  - |
-                    ?>
-              mode: '000644'
-              owner: apache
-              group: apache
-          services:
-            sysvinit:
-              httpd:
-                enabled: 'true'
-                ensureRunning: 'true'
-
-    # EC2 instance properties 
-    Properties:
-      # gets type of instance from parameters
-      InstanceType: t2.micro
-      # adds instance profile to enable CloudWatch and SSM
-      IamInstanceProfile: !Ref InstanceProfile
-      # find instance AMI based on mapping of regions to AMIs
-      ImageId: !Ref LatestAmiId
-      # uses the security group defined in this template as the security group for this instance
-      NetworkInterfaces:
-        - AssociatePublicIpAddress: true
-          GroupSet: 
-            - !Ref InstanceSecurityGroup
-          SubnetId: !Ref LabPublicSubnet
-          DeviceIndex:  '0'
-          DeleteOnTermination: true
-      # Tag for the EC2 Instance
-      Tags:
-          - Key: Workload
-            Value: Security-CW-Lab
-          - Key: Name
-            Value: Security-CW-Lab-Instance
-      # user data segment contains data held on creation by user
-      UserData: !Base64 
-        'Fn::Join':
-          - ''
-          # #! used to start script
-          - - |
-              #!/bin/bash -xe
-            - |
-              # installs cfn-bootstrap using yum
-              yum install -y aws-cfn-bootstrap
-            - |
-              # Install the files and packages from the metadata
-            - '/opt/aws/bin/cfn-init -v '
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource EC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-            - |
-              # Signal the status from cfn-init
-            - '/opt/aws/bin/cfn-signal -e $? '
-            - '         --stack '
-            - !Ref 'AWS::StackName'
-            - '         --resource EC2Instance '
-            - '         --region '
-            - !Ref 'AWS::Region'
-            - |+
-
-    # Don't mark as complete until cfn-init done
-    CreationPolicy:
-      ResourceSignal: 
-        Timeout: PT5M
-
-  # SSH Security Group for that instance
-  InstanceSecurityGroup:
-    Type: 'AWS::EC2::SecurityGroup'
-    Properties:
-      GroupDescription: Enables SSH via port 22, HTTP via port 80
-      VpcId: !Ref LabVPC
-      # defines inbound rules as accepting SSH connections from the parameterized ssh location via port 22 using TCP protocol
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: 0.0.0.0/0
-          
-  CloudWatchIAMRole:
-    Type: AWS::IAM::Role
-    Properties:
-      Description: IAM role used to enable CloudWatch Agent and SSM usage for the EC2 Instance
-      # Allows EC2 to  assume this role
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - ec2.amazonaws.com
-            Action: 
-              - sts:AssumeRole
-      # Adds policies to the role (CloudWatchAgentAdminPolicy, CloudWatchAgentServerPolicy, AmazonSSMManagedInstanceCore)
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/CloudWatchAgentAdminPolicy
-        - arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy
-        - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
-
-  #  IAM instance profile to pass the IAM role to the instance on startup
-  InstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Roles:
-        - !Ref CloudWatchIAMRole
-
-  # S3 Bucket for long-term storage and archival of logs
-  S3LogBucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Ref BucketName
-      BucketEncryption:
-        ServerSideEncryptionConfiguration:
-          - ServerSideEncryptionByDefault:
-              SSEAlgorithm: AES256
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      Tags:
-          - Key: Workload
-            Value: Security-CW-Lab
-  
-  # S3 Bucket Policy that allows CW to export logs
-  S3BucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref S3LogBucket
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Action: s3:GetBucketAcl 
-            Effect: Allow
-            Resource: !GetAtt S3LogBucket.Arn
-            Principal: 
-              Service: !Join
-                - ""
-                - 
-                  - "logs."
-                  - !Ref AWS::Region
-                  - ".amazonaws.com"
-          -
-            Action: s3:PutObject
-            Effect: Allow
-            Resource: !Join
-              - ""
-              - 
-                - !GetAtt S3LogBucket.Arn
-                - "/lablogs/*"
-            Principal:
-              Service: !Join
-                - ""
-                - 
-                  - "logs."
-                  - !Ref AWS::Region
-                  - ".amazonaws.com"
-  
-  ############################
-  ###### VPC RESOURCES #######
-  ############################
-
-  # VPC for container networking
-  LabVPC: 
-    Type: AWS::EC2::VPC
-    Properties:
-      CidrBlock: 10.0.0.0/16
-      # DNS resolution will be supported for this VPC
-      EnableDnsSupport: true
-      # Instances launched in this VPC get DNS hostnames by default
-      EnableDnsHostnames: true
-      Tags:
-        - Key : Workload
-          Value : Security-CW-Lab
-  
-  ##### PUBLIC NETWORKING #####
-  # Public subnet for the VPC
-  LabPublicSubnet:
-    Type: AWS::EC2::Subnet
-    Properties:
-      CidrBlock: '10.0.0.0/24'
-      VpcId: !Ref 'LabVPC'
-      # Instances in this subnet will receive a public IPv4
-      MapPublicIpOnLaunch: true
-      AvailabilityZone: !Select
-        - 0 
-        - !GetAZs 
-      Tags:
-        - Key : Workload
-          Value : Security-CW-Lab 
-  # Internet Gateway and attachment
-  LabIGW:
-    Type: AWS::EC2::InternetGateway
-  GatewayAttachment:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref 'LabVPC'
-      InternetGatewayId: !Ref 'LabIGW'
-  # Public route table and route to move traffic from  0.0.0.0/0 to the IGW
-  PublicRouteTable:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref 'LabVPC'
-  PublicRoute:
-    Type: AWS::EC2::Route
-    DependsOn: GatewayAttachment
-    Properties:
-      RouteTableId: !Ref 'PublicRouteTable'
-      DestinationCidrBlock: '0.0.0.0/0'
-      GatewayId: !Ref 'LabIGW'
-  PublicSubnetOneRouteTableAssociation:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref LabPublicSubnet
-      RouteTableId: !Ref PublicRouteTable
-    
-
-
-Outputs:
-  WebsiteURL:
-    Description: Application URL
-    Value: !Join 
-      - ''
-      - - 'http://'
-        - !GetAtt 
-          - EC2Instance
-          - PublicDnsName
-  EC2InstanceID:
-      Description: ID of the EC2 Instance
-      Value: !Ref EC2Instance
\ No newline at end of file
diff --git a/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section1/pattern1-base.yml b/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section1/pattern1-base.yml
deleted file mode 100644
index cab5bb44a..000000000
--- a/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section1/pattern1-base.yml
+++ /dev/null
@@ -1,267 +0,0 @@
-Outputs:
-  OutputPattern1VPC:
-    Description: Baseline VPC
-    Value: !Ref Pattern1VPC
-    Export:
-      Name: !Sub "${AWS::StackName}-VpcId"
-  OutputPattern1VPCCidrBlock:
-    Description: Baseline VPC Cidr Block
-    Value: !GetAtt Pattern1VPC.CidrBlock
-    Export:
-      Name: !Sub "${AWS::StackName}-VpcCidrBlock"      
-  OutputPattern1PublicSubnet1:
-    Description: Public Subnet 1 VPC
-    Value: !Ref Pattern1PublicSubnet1
-    Export:
-      Name: !Sub "${AWS::StackName}-PublicSubnet1"
-  OutputPattern1PublicSubnet2:
-    Description: Public Subnet 2 VPC
-    Value: !Ref Pattern1PublicSubnet2
-    Export:
-      Name: !Sub "${AWS::StackName}-PublicSubnet2"
-  OutputPattern1PrivateSubnet1:
-    Description: Private Subnet 1 VPC
-    Value: !Ref Pattern1PrivateSubnet1
-    Export:
-      Name: !Sub "${AWS::StackName}-PrivateSubnet1"
-  OutputPattern1PrivateSubnet2:
-    Description: Private Subnet 2 VPC
-    Value: !Ref Pattern1PrivateSubnet2
-    Export:
-      Name: !Sub "${AWS::StackName}-PrivateSubnet2"
-  OutputPattern1AppContainerRepository:
-    Description: Applicaton ECR Repository
-    Value: !Ref Pattern1AppContainerRepository
-    Export:
-      Name: !Sub "${AWS::StackName}-Pattern1AppContainerRepository"
-
-
-Resources:
-  #------------------------------------------------------------
-  # Create a VPC with a public and private subnet
-  #------------------------------------------------------------
-  Pattern1VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 172.31.0.0/16
-      Tags:
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-  
-  Pattern1PublicSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      AvailabilityZone: ap-southeast-2a
-      CidrBlock: 172.31.1.0/24
-      MapPublicIpOnLaunch: true
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "PublicSubnet1"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-  
-  Pattern1PublicSubnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      AvailabilityZone: ap-southeast-2b
-      CidrBlock: 172.31.3.0/24
-      MapPublicIpOnLaunch: true
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "PublicSubnet2"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1PrivateSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      AvailabilityZone: ap-southeast-2a
-      CidrBlock: 172.31.2.0/24
-      MapPublicIpOnLaunch: false
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "PrivateSubnet1"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1PrivateSubnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      AvailabilityZone: ap-southeast-2b
-      CidrBlock: 172.31.4.0/24
-      MapPublicIpOnLaunch: false
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "PrivateSubnet2"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  #-------------------------------------------------------------
-  # Create an IGW and attach to the created VPC
-  # Create a NAT GW with an associated public IP address.
-  #------------------------------------------------------------- 
-
-  Pattern1IGW:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "igw"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1IGWAttach:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      InternetGatewayId: !Ref Pattern1IGW
-  
-  Pattern1NatGateway:
-    Type: "AWS::EC2::NatGateway"
-    DependsOn: Pattern1NatPublicIP
-    Properties: 
-      AllocationId: !GetAtt Pattern1NatPublicIP.AllocationId
-      SubnetId: !Ref Pattern1PublicSubnet1
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "nat"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1NatPublicIP:
-    Type: "AWS::EC2::EIP"
-    DependsOn: Pattern1VPC
-    Properties:
-      Domain: vpc
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern1VPC, "NatPublicIP"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-      
-  #-------------------------------------------------------------
-  # Create public route table and attach to the public subnets
-  #-------------------------------------------------------------
-
-  Pattern1PublicRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern1VPC, "PublicRouteTable1"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-  
-  Pattern1PublicRouteTable2:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern1VPC, "PublicRouteTable2"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-  
-  Pattern1PublicRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - Pattern1IGW
-      - Pattern1IGWAttach
-    Properties:
-      RouteTableId: !Ref Pattern1PublicRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref Pattern1IGW
-
-  Pattern1PublicRoute2:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - Pattern1IGW
-      - Pattern1IGWAttach
-    Properties:
-      RouteTableId: !Ref Pattern1PublicRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref Pattern1IGW
-  
-  Pattern1PublicSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern1PublicSubnet1
-      RouteTableId: !Ref Pattern1PublicRouteTable1
-
-  Pattern1PublicSubnet1RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern1PublicSubnet2
-      RouteTableId: !Ref Pattern1PublicRouteTable2
-
-  #-------------------------------------------------------------
-  # Create public route table and attach to the public subnets
-  #-------------------------------------------------------------
-
-  Pattern1PrivateRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern1VPC, "PrivateRouteTable1"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-  
-  Pattern1PrivateRouteTable2:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern1VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern1VPC, "PrivateRouteTable2"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1PrivateRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: Pattern1IGW
-    Properties:
-      RouteTableId: !Ref Pattern1PrivateRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Pattern1NatGateway
-
-  Pattern1PrivateRoute2:
-    Type: 'AWS::EC2::Route'
-    DependsOn: Pattern1IGW
-    Properties:
-      RouteTableId: !Ref Pattern1PrivateRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Pattern1NatGateway
-
-  Pattern1PrivateSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern1PrivateSubnet1
-      RouteTableId: !Ref Pattern1PrivateRouteTable1
-
-  Pattern1PrivateSubnet1RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern1PrivateSubnet2
-      RouteTableId: !Ref Pattern1PrivateRouteTable2
-
-  # ------------------
-  # ECR Repository
-  # ------------------
-
-  Pattern1AppContainerRepository: 
-    Type: AWS::ECR::Repository
\ No newline at end of file
diff --git a/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section2/pattern1-app.yml b/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section2/pattern1-app.yml
deleted file mode 100644
index 4d9cca24b..000000000
--- a/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section2/pattern1-app.yml
+++ /dev/null
@@ -1,345 +0,0 @@
-Parameters:
-  BaselineVpcStack:
-    Type: String
-  ECRImageURI:
-    Type: String
-
-
-Outputs:
-  OutputPattern1ALB:
-    Description: Elastic Load Balancer
-    Value: !Ref Pattern1ALB
-    Export:
-      Name: !Sub "${AWS::StackName}-ALB"
-  OutputPattern1KMSKey:
-    Description: KMS Key used by app to encrypt / decrypt data
-    Value: !Ref Pattern1KMSKey
-  OutputPattern1ELBSecurityGroup:
-    Description: Elastic Load Balancer Security Group
-    Value: !Ref Pattern1ELBSecurityGroup
-    Export:
-      Name: !Sub "${AWS::StackName}-ELBSecurityGroup"
-  OutputPattern1ApplicationEndpoint:
-    Description: Application Endpoint
-    Value: !GetAtt Pattern1ALB.DNSName
-    Export:
-      Name: !Sub "${AWS::StackName}-ApplicationEndpoint"
-  OutputPattern1ECSTaskRole:
-    Description: App Task Role ARN
-    Value: !GetAtt Pattern1ECSTaskRole.Arn
-    Export:
-      Name: !Sub "${AWS::StackName}-ApplicationTaskRole"
-
-
-Resources:
-#----------------------------------------------------------------------------------------
-# Build load balancer.
-#----------------------------------------------------------------------------------------
-  Pattern1ALB:
-    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
-    Properties:
-      SecurityGroups:
-        - !Ref Pattern1ELBSecurityGroup
-      Subnets:
-        -
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PublicSubnet1"
-        -
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PublicSubnet2"
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalALB"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1ALBTargetGroup:
-    Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    Properties:
-      TargetType: ip
-      HealthCheckEnabled: True
-      HealthCheckIntervalSeconds: 30
-      HealthCheckPath: /
-      HealthCheckPort: 80
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: 5
-      HealthyThresholdCount: 3
-      UnhealthyThresholdCount: 5
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 60
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      Port: 80
-      Protocol: HTTP
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalALBTargetGroup"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-  Pattern1ALBListener:
-    Type: AWS::ElasticLoadBalancingV2::Listener
-    Properties:
-      LoadBalancerArn: !Ref Pattern1ALB
-      Port: 80
-      Protocol: HTTP
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref Pattern1ALBTargetGroup
-
-#----------------------------------------------------------------------------------------
-# Build load balancer security group.
-#----------------------------------------------------------------------------------------
-  Pattern1ELBSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Enable HTTP from the Internet
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: '0.0.0.0/0'
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalELBSecurityGroup"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"
-
-#----------------------------------------------------------------------------------------
-# Build ECS Resources.
-#----------------------------------------------------------------------------------------
-
-  Pattern1ContainerSecGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: !Join ['', [!Ref 'AWS::StackName', -Pattern1ContainerSecGroup]]
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          SourceSecurityGroupId: !Ref Pattern1ELBSecurityGroup
-
-  Pattern1ECSCluster:
-    Type: AWS::ECS::Cluster
-    Properties:
-      CapacityProviders:
-        - FARGATE
-          # FARGATE_SPOT
-      DefaultCapacityProviderStrategy:
-        - CapacityProvider: FARGATE
-          Weight: 1
-
-  Pattern1ECSService:
-    DependsOn: Pattern1ALB
-    Type: AWS::ECS::Service
-    Properties:
-      Cluster: !Ref Pattern1ECSCluster
-      DeploymentConfiguration:
-        MaximumPercent: 200
-        MinimumHealthyPercent: 100
-      DesiredCount: 1
-      HealthCheckGracePeriodSeconds: 60
-      LoadBalancers:
-        - ContainerName: simple-app
-          ContainerPort: 80
-          TargetGroupArn: !Ref Pattern1ALBTargetGroup
-      TaskDefinition: !Ref Pattern1TaskDefinition
-      ServiceName: !Join ['', [!Ref 'AWS::StackName', -pattern1-app-api]]
-      LaunchType: FARGATE
-      NetworkConfiguration:
-        AwsvpcConfiguration:
-          AssignPublicIp: ENABLED
-          Subnets:
-            - Fn::ImportValue:
-                !Sub "${BaselineVpcStack}-PrivateSubnet1"
-            - Fn::ImportValue:
-                !Sub "${BaselineVpcStack}-PrivateSubnet2"
-          SecurityGroups:
-            - !Ref Pattern1ContainerSecGroup
-
-
-  Pattern1TaskDefinition:
-    Type: AWS::ECS::TaskDefinition
-    Properties:
-      Family: !Join ['', [!Ref 'AWS::StackName', -pattern1-app]]
-      TaskRoleArn: !Ref Pattern1ECSTaskRole
-      ExecutionRoleArn: !Ref Pattern1ECSTaskExecutionRole
-      NetworkMode: awsvpc
-      RequiresCompatibilities:
-        - FARGATE
-      Cpu: 256
-      Memory: 0.5GB
-      ContainerDefinitions:
-      - Name: simple-app
-        Essential: 'true'
-        Image: !Ref ECRImageURI 
-        LogConfiguration:
-          LogDriver: awslogs
-          Options:
-            awslogs-group: !Ref 'Pattern1ECSCloudWatchLogsGroup'
-            awslogs-region: !Ref 'AWS::Region'
-            awslogs-stream-prefix: !Join ['', [!Ref 'AWS::StackName', -pattern1-app]]
-        Environment:
-          - Name: DBHOST
-            Value: !GetAtt Pattern1RDS.Endpoint.Address
-          - Name: KeyId
-            Value: !Ref Pattern1KMSKey
-          - NAME: DBSecret
-            Value: !Ref Pattern1RDSSecret
-        PortMappings:
-        - ContainerPort: 80
-
-
-  Pattern1ECSCloudWatchLogsGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: !Ref AWS::StackName
-      RetentionInDays: 365
-
-  #----------------------------------------------------------------------------------------
-  # Build ECS IAM Roles.
-  #----------------------------------------------------------------------------------------
-
-  Pattern1ECSServiceRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2008-10-17
-        Statement:
-          - Sid: ''
-            Effect: Allow
-            Principal:
-              Service: ecs.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceRole'
-
-  Pattern1ECSTaskRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Join ['', [!Ref 'AWS::StackName', -Pattern1ECSTaskRole]]
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ecs-tasks.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Path: /
-      Policies:            
-        - PolicyName: KMSAccess
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: '*'
-                Resource: !GetAtt Pattern1KMSKey.Arn
-        - PolicyName: SMAccess
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'secretsmanager:GetSecretValue'
-                Resource: !Ref Pattern1RDSSecret                
-        - PolicyName: CloudWatchLogs
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'logs:*'
-                Resource: !GetAtt Pattern1ECSCloudWatchLogsGroup.Arn        
-        ### This needs to be restricted 
-
-  Pattern1ECSTaskExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Join ['', [!Ref 'AWS::StackName', -Pattern1ECSTaskExecutionRole]]
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: ecs-tasks.amazonaws.com
-            Action: 'sts:AssumeRole'
-      ManagedPolicyArns:
-        - 'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'
-
-  #----------------------------------------------------------------------------------------
-  # Build RDS Instance.
-  #----------------------------------------------------------------------------------------
-
-  Pattern1RDS:
-    Type: AWS::RDS::DBInstance
-    Properties:
-      AllocatedStorage: 5
-      DBInstanceClass: db.t2.small
-      Engine: MySQL
-      MasterUsername: !Join ['', ['{{resolve:secretsmanager:', !Ref Pattern1RDSSecret, ':SecretString:username}}' ]]
-      MasterUserPassword: !Join ['', ['{{resolve:secretsmanager:', !Ref Pattern1RDSSecret, ':SecretString:password}}' ]]
-      DBSubnetGroupName: !Ref Pattern1RDSSubnetGroup
-      VPCSecurityGroups: 
-        - !Ref Pattern1RDSSecGroup
-
-
-  Pattern1RDSSecGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: !Join ['', [!Ref 'AWS::StackName', -Pattern1RDSSecGroup]]
-      VpcId:
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 3306
-          ToPort: 3306
-          CidrIp: 
-            Fn::ImportValue:
-              !Sub "${BaselineVpcStack}-VpcCidrBlock"
-
-  Pattern1RDSSubnetGroup:
-    Type: "AWS::RDS::DBSubnetGroup"
-    Properties:
-      DBSubnetGroupDescription: "Subnet Group"
-      SubnetIds:
-        - Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PrivateSubnet1"
-        - Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PrivateSubnet2"
-
-  Pattern1RDSSecret:
-    Type: AWS::SecretsManager::Secret
-    Properties:
-      Description: 'This is the secret for my RDS instance'
-      GenerateSecretString:
-        SecretStringTemplate: '{"username": "masteradmin"}'
-        GenerateStringKey: 'password'
-        PasswordLength: 16
-        ExcludeCharacters: '"@/\'
-
-  #----------------------------------------------------------------------------------------
-  # Build Parameter KMS Key
-  #----------------------------------------------------------------------------------------
-
-  Pattern1KMSKey:
-    Type: "AWS::KMS::Key"
-    Properties:
-      KeyPolicy:
-        Version: 2012-10-17
-        Id: key-pattern1-1
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS: !Join
-                - ""
-                - - "arn:aws:iam::"
-                  - !Ref "AWS::AccountId"
-                  - ":root"
-            Action: "kms:*"
-            Resource: "*"
\ No newline at end of file
diff --git a/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section3/pattern1-logging.yml b/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section3/pattern1-logging.yml
deleted file mode 100644
index bb2e4437d..000000000
--- a/static/Security/300_Autonomous_Monitoring_Of_Cryptographic_Activity_With_KMS/Code/templates/section3/pattern1-logging.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-Parameters:
-  AppECSTaskRoleArn:
-    Description: The IAM Role Arn of Application ECS Task
-    Type: String
-  EmailAddress:
-    Description: The email address to send notification to.
-    Type: String
-
-Outputs:
-  OutputPattern1CloudWatchLogGroup:
-    Description: CloudWatch Log Groups
-    Value: !Ref Pattern1CloudWatchLogGroup
-    Export:
-      Name: !Sub "${AWS::StackName}-Pattern1CloudWatchLogGroup"
-  OutputPattern1CloudTrail:
-    Description: CloudTrail Trail
-    Value: !Ref Pattern1CloudTrail
-    Export:
-      Name: !Sub "${AWS::StackName}-Pattern1CloudTrail"
-
-Resources:
-  Pattern1CloudTrailS3Bucket:
-    Type: AWS::S3::Bucket
-    DeletionPolicy: Retain
-    Properties: {}
-
-  Pattern1CloudTrailS3BucketPolicy: 
-    Type: AWS::S3::BucketPolicy
-    Properties: 
-      Bucket: !Ref Pattern1CloudTrailS3Bucket
-      PolicyDocument: 
-        Version: "2012-10-17"
-        Statement: 
-          - 
-            Sid: "AWSCloudTrailAclCheck"
-            Effect: "Allow"
-            Principal: 
-              Service: "cloudtrail.amazonaws.com"
-            Action: "s3:GetBucketAcl"
-            Resource: 
-              !Sub |-
-                arn:aws:s3:::${Pattern1CloudTrailS3Bucket}
-          - 
-            Sid: "AWSCloudTrailWrite"
-            Effect: "Allow"
-            Principal: 
-              Service: "cloudtrail.amazonaws.com"
-            Action: "s3:PutObject"
-            Resource:
-              !Sub |-
-                arn:aws:s3:::${Pattern1CloudTrailS3Bucket}/AWSLogs/${AWS::AccountId}/*
-            Condition: 
-              StringEquals:
-                s3:x-amz-acl: "bucket-owner-full-control"
-
-
-  Pattern1CloudTrail:
-    Type: AWS::CloudTrail::Trail
-    Properties: 
-      CloudWatchLogsLogGroupArn: !GetAtt Pattern1CloudWatchLogGroup.Arn
-      CloudWatchLogsRoleArn: !GetAtt Pattern1CloudWatchLogGroupRole.Arn
-      EnableLogFileValidation: True   
-      IsLogging: True
-      IsMultiRegionTrail: False
-      S3BucketName: !Ref Pattern1CloudTrailS3Bucket
-      KMSKeyId: !Ref Pattern1KMSCloudTrail
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "Pattern1Trail"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern1"        
-
-  #----------------------------
-  # Log Groups
-  #----------------------------
-
-  Pattern1CloudWatchLogGroupRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: !Join ['', [!Ref 'AWS::StackName', -Pattern1CloudTrailRole]]
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Path: /
-      Policies:
-        - PolicyName: AWSCloudTrailCreateLogStream
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'logs:CreateLogStream'
-                Resource: !GetAtt Pattern1CloudWatchLogGroup.Arn
-        - PolicyName: AWSCloudTrailPutLogEvents
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Effect: Allow
-                Action: 'logs:PutLogEvents'
-                Resource: !GetAtt Pattern1CloudWatchLogGroup.Arn
-
-  Pattern1CloudWatchLogGroup: 
-    Type: AWS::Logs::LogGroup
-    Properties: 
-      RetentionInDays: 7
-
-  Pattern1CloudWatchLogGroupMetricFilter: 
-    Type: AWS::Logs::MetricFilter
-    Properties: 
-      LogGroupName: !Ref "Pattern1CloudWatchLogGroup"
-      FilterPattern: !Sub 
-                        - '{ $.errorCode = "*" && $.eventSource= "kms.amazonaws.com" && $.userIdentity.sessionContext.sessionIssuer.arn = "${ECSTaskRoleArn}" }'
-                        - ECSTaskRoleArn: !Ref AppECSTaskRoleArn
-      MetricTransformations: 
-        - 
-          MetricValue: "1"
-          MetricNamespace: "Pattern1Application/KMSSecurity"
-          MetricName: "KMSSecurityError"
-
-  Pattern1CloudWatchLogGroupMetricFilterAlarm:
-    Type: AWS::CloudWatch::Alarm
-    Properties:
-      AlarmDescription: Pattern1 Application KMS Security Alarm.
-      AlarmName: Pattern1ApplicationKMSSecurityAlarm
-      ComparisonOperator: GreaterThanThreshold
-      EvaluationPeriods: 1
-      Namespace: "Pattern1Application/KMSSecurity"
-      MetricName: "KMSSecurityError"
-      Period: 10
-      Statistic: Sum
-      Threshold: 1
-      TreatMissingData: ignore
-      AlarmActions:
-        - !Ref Pattern1CloudWatchAlarmTopic
-
-  Pattern1CloudWatchAlarmTopic:
-    Type: 'AWS::SNS::Topic'
-    Properties: {}
-
-  Pattern1CloudWatchAlarmTopicSubscription:
-    Type: 'AWS::SNS::Subscription'
-    Properties:
-      Endpoint: !Ref EmailAddress
-      Protocol: email
-      TopicArn: !Ref Pattern1CloudWatchAlarmTopic
-
-  #----------------------------------------------------------------------------------------
-  # Build Parameter KMS Key
-  #----------------------------------------------------------------------------------------
-
-  Pattern1KMSCloudTrail:
-    Type: "AWS::KMS::Key"
-    Properties:
-      KeyPolicy:
-        Version: 2012-10-17
-        Id: key-pattern1-cloudtrail
-        Statement:
-          - Sid: Enable IAM User Permissions
-            Effect: Allow
-            Principal:
-              AWS: !Join
-                - ""
-                - - "arn:aws:iam::"
-                  - !Ref "AWS::AccountId"
-                  - ":root"
-            Action: "kms:*"
-            Resource: "*"
-          - Sid: Allow CloudTrail to encrypt logs
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Action: "kms:GenerateDataKey"
-            Resource: "*"
-            Condition:
-              StringLike:
-                kms:EncryptionContext:aws:cloudtrail:arn: !Sub "arn:aws:cloudtrail:*:${AWS::AccountId}:trail/*"
-          - Sid: Allow CloudTrail to describe key
-            Effect: Allow
-            Principal:
-              Service: cloudtrail.amazonaws.com
-            Action: "kms:DescribeKey"
-            Resource: "*"                        
-          - Sid: Allow principals in the account to decrypt log files
-            Effect: Allow
-            Principal:
-              AWS: "*"
-            Action: 
-              - "kms:Decrypt"
-              - "kms:ReEncryptFrom"
-            Resource: "*"
-            Condition:
-              StringEquals:
-                  kms:CallerAccount: !Ref "AWS::AccountId"
-              StringLike:
-                  kms:EncryptionContext:aws:cloudtrail:arn: !Sub "arn:aws:cloudtrail:*:${AWS::AccountId}:trail/*"
-          - Sid: Allow alias creation during setup
-            Effect: Allow
-            Principal:
-              AWS: "*"
-            Action: "kms:CreateAlias"
-            Resource: "*"
-            Condition:
-              StringEquals:
-                kms:CallerAccount: !Ref AWS::AccountId
-                kms:ViaService": !Sub ec2.${AWS::Region}.amazonaws.com"
-          - Sid: Enable cross account log decryption
-            Effect: Allow
-            Principal:
-              AWS: "*"
-            Action: 
-              - kms:Decrypt
-              - kms:ReEncryptFrom
-            Resource: "*"
-            Condition:
-              StringEquals:
-                kms:CallerAccount: !Ref AWS::AccountId
-              StringLike:
-                kms:EncryptionContext:aws:cloudtrail:arn: !Sub "arn:aws:cloudtrail:*:${AWS::AccountId}:trail/*"
diff --git a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/scripts/section4_ssm_automation_document.yml b/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/scripts/section4_ssm_automation_document.yml
deleted file mode 100644
index 758c999b7..000000000
--- a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/scripts/section4_ssm_automation_document.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-description: CreateImage
-schemaVersion: '0.3'
-parameters:
-  ImageBuilderPipeline:
-    description: (Required) Corresponding EC2 Image Builder Pipeline to execute.
-    type: String
-  ApplicationStack:
-    description: (Required) Corresponding Application Stack to Deploy the Image to.
-    type: String
-mainSteps:
-  - name: ExecuteImageCreation
-    action: aws:executeAwsApi
-    maxAttempts: 10
-    timeoutSeconds: 3600
-    onFailure: Abort
-    inputs:
-      Service: imagebuilder
-      Api: StartImagePipelineExecution
-      imagePipelineArn: '{{ ImageBuilderPipeline }}'
-    outputs:
-    - Name: imageBuildVersionArn
-      Selector: $.imageBuildVersionArn
-      Type: String
-  - name: WaitImageComplete
-    action: aws:waitForAwsResourceProperty
-    maxAttempts: 10
-    timeoutSeconds: 3600
-    onFailure: Abort
-    inputs:
-      Service: imagebuilder
-      Api: GetImage
-      imageBuildVersionArn: '{{ ExecuteImageCreation.imageBuildVersionArn }}'
-      PropertySelector: image.state.status
-      DesiredValues: 
-        - AVAILABLE
-  - name: GetBuiltImage
-    action: aws:executeAwsApi
-    maxAttempts: 10
-    timeoutSeconds: 3600
-    onFailure: Abort
-    inputs:
-      Service: imagebuilder
-      Api: GetImage         
-      imageBuildVersionArn: '{{ ExecuteImageCreation.imageBuildVersionArn }}'
-    outputs:
-    - Name: image
-      Selector: $.image.outputResources.amis[0].image
-      Type: String
-  - name: UpdateCluster
-    action: aws:executeAwsApi
-    maxAttempts: 10
-    timeoutSeconds: 3600
-    onFailure: Abort
-    inputs:
-      Service: cloudformation
-      Api: UpdateStack
-      StackName: '{{ ApplicationStack }}'
-      UsePreviousTemplate: true
-      Parameters:
-        - ParameterKey: BaselineVpcStack
-          UsePreviousValue: true
-        - ParameterKey: AmazonMachineImage
-          ParameterValue: '{{ GetBuiltImage.image }}'
-      Capabilities:
-        - CAPABILITY_IAM
-  - name: WaitDeploymentComplete
-    action: aws:waitForAwsResourceProperty
-    maxAttempts: 10
-    timeoutSeconds: 3600
-    onFailure: Abort
-    inputs:
-      Service: cloudformation
-      Api: DescribeStacks
-      StackName: '{{ ApplicationStack }}'
-      PropertySelector: Stacks[0].StackStatus
-      DesiredValues: 
-        - UPDATE_COMPLETE
\ No newline at end of file
diff --git a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section1/pattern3-base.yml b/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section1/pattern3-base.yml
deleted file mode 100644
index 856b5eff9..000000000
--- a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section1/pattern3-base.yml
+++ /dev/null
@@ -1,257 +0,0 @@
-Resources:
-  #------------------------------------------------------------
-  # Create a VPC with a public and private subnet across two AZs
-  #------------------------------------------------------------
-  Pattern3VPC:
-    Type: 'AWS::EC2::VPC'
-    Properties:
-      CidrBlock: 172.31.0.0/16
-      Tags:
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-  
-  Pattern3PublicSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      AvailabilityZone: ap-southeast-2a
-      CidrBlock: 172.31.1.0/24
-      MapPublicIpOnLaunch: true
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "PublicSubnet1"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-  
-  Pattern3PublicSubnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      AvailabilityZone: ap-southeast-2b
-      CidrBlock: 172.31.3.0/24
-      MapPublicIpOnLaunch: true
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "PublicSubnet2"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3PrivateSubnet1:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      AvailabilityZone: ap-southeast-2a
-      CidrBlock: 172.31.2.0/24
-      MapPublicIpOnLaunch: false
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "PrivateSubnet1"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3PrivateSubnet2:
-    Type: 'AWS::EC2::Subnet'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      AvailabilityZone: ap-southeast-2b
-      CidrBlock: 172.31.4.0/24
-      MapPublicIpOnLaunch: false
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "PrivateSubnet2"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  #-------------------------------------------------------------
-  # Create an IGW and attach to the created VPC
-  # Create a NAT GW with an associated public IP address.
-  #------------------------------------------------------------- 
-
-  Pattern3IGW:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "igw"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3IGWAttach:
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      InternetGatewayId: !Ref Pattern3IGW
-  
-  Pattern3NatGateway:
-    Type: "AWS::EC2::NatGateway"
-    DependsOn: Pattern3NatPublicIP
-    Properties: 
-      AllocationId: !GetAtt Pattern3NatPublicIP.AllocationId
-      SubnetId: !Ref Pattern3PublicSubnet1
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "nat"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3NatPublicIP:
-    Type: "AWS::EC2::EIP"
-    DependsOn: Pattern3VPC
-    Properties:
-      Domain: vpc
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref Pattern3VPC, "NatPublicIP"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-      
-  #-------------------------------------------------------------
-  # Create public route table and attach to the public subnets
-  #-------------------------------------------------------------
-
-  Pattern3PublicRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern3VPC, "PublicRouteTable1"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-  
-  Pattern3PublicRouteTable2:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern3VPC, "PublicRouteTable2"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-  
-  Pattern3PublicRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - Pattern3IGW
-      - Pattern3IGWAttach
-    Properties:
-      RouteTableId: !Ref Pattern3PublicRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref Pattern3IGW
-
-  Pattern3PublicRoute2:
-    Type: 'AWS::EC2::Route'
-    DependsOn: 
-      - Pattern3IGW
-      - Pattern3IGWAttach
-    Properties:
-      RouteTableId: !Ref Pattern3PublicRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref Pattern3IGW
-  
-  Pattern3PublicSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern3PublicSubnet1
-      RouteTableId: !Ref Pattern3PublicRouteTable1
-
-  Pattern3PublicSubnet1RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern3PublicSubnet2
-      RouteTableId: !Ref Pattern3PublicRouteTable2
-
-  #-------------------------------------------------------------
-  # Create public route table and attach to the public subnets
-  #-------------------------------------------------------------
-
-  Pattern3PrivateRouteTable1:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern3VPC, "PrivateRouteTable1"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-  
-  Pattern3PrivateRouteTable2:
-    Type: 'AWS::EC2::RouteTable'
-    Properties:
-      VpcId: !Ref Pattern3VPC
-      Tags:
-        - Key: Network
-          Value: Public
-        - Key: Name
-          Value: !Join [ "-", [ !Ref Pattern3VPC, "PrivateRouteTable2"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3PrivateRoute1:
-    Type: 'AWS::EC2::Route'
-    DependsOn: Pattern3IGW
-    Properties:
-      RouteTableId: !Ref Pattern3PrivateRouteTable1
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Pattern3NatGateway
-
-  Pattern3PrivateRoute2:
-    Type: 'AWS::EC2::Route'
-    DependsOn: Pattern3IGW
-    Properties:
-      RouteTableId: !Ref Pattern3PrivateRouteTable2
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref Pattern3NatGateway
-
-  Pattern3PrivateSubnet1RouteTableAssociation1:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern3PrivateSubnet1
-      RouteTableId: !Ref Pattern3PrivateRouteTable1
-
-  Pattern3PrivateSubnet1RouteTableAssociation2:
-    Type: 'AWS::EC2::SubnetRouteTableAssociation'
-    Properties:
-      SubnetId: !Ref Pattern3PrivateSubnet2
-      RouteTableId: !Ref Pattern3PrivateRouteTable2
-#---------------------------------------------------------
-# Output section
-#---------------------------------------------------------
-Outputs:
-  OutputPatternStackName:
-    Description: Stack name
-    Value: !Ref AWS::StackName
-  OutputPattern3VPC:
-    Description: Baseline VPC
-    Value: !Ref Pattern3VPC
-    Export:
-      Name: !Sub "${AWS::StackName}-VpcId"
-  OutputPattern3PublicSubnet1:
-    Description: Public Subnet 1 VPC
-    Value: !Ref Pattern3PublicSubnet1
-    Export:
-      Name: !Sub "${AWS::StackName}-PublicSubnet1"
-  OutputPattern3PublicSubnet2:
-    Description: Public Subnet 2 VPC
-    Value: !Ref Pattern3PublicSubnet2
-    Export:
-      Name: !Sub "${AWS::StackName}-PublicSubnet2"
-  OutputPattern3PrivateSubnet1:
-    Description: Private Subnet 1 VPC
-    Value: !Ref Pattern3PrivateSubnet1
-    Export:
-      Name: !Sub "${AWS::StackName}-PrivateSubnet1"
-  OutputPattern3PrivateSubnet2:
-    Description: Private Subnet 2 VPC
-    Value: !Ref Pattern3PrivateSubnet2
-    Export:
-      Name: !Sub "${AWS::StackName}-PrivateSubnet2"
-  OutputPatternStackName:
-    Description: Stack name
-    Value: !Ref AWS::StackName
diff --git a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section2/pattern3-application.yml b/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section2/pattern3-application.yml
deleted file mode 100644
index 997f4e639..000000000
--- a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section2/pattern3-application.yml
+++ /dev/null
@@ -1,296 +0,0 @@
-Parameters:
-  BaselineVpcStack:
-    Type: String
-  NumberOfInstanceCluster:
-    Type: String
-    Default: "2"
-  MaxNumberOfInstanceCluster:
-    Type: String
-    Default: "2"
-  AmazonMachineImage:
-    Type: String
-
-Resources:
-#----------------------------------------------------------------------------------------
-# Build load balancer.
-#----------------------------------------------------------------------------------------
-  Pattern3ALB:
-    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
-    Properties:
-      SecurityGroups: 
-        - !Ref Pattern3ELBSecurityGroup
-      Subnets: 
-        - 
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PublicSubnet1"
-        - 
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PublicSubnet2"
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalALB"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3ALBTargetGroup:
-    Type: AWS::ElasticLoadBalancingV2::TargetGroup
-    Properties:
-      HealthCheckEnabled: True
-      HealthCheckIntervalSeconds: 30
-      HealthCheckPath: /
-      HealthCheckPort: 80
-      HealthCheckProtocol: HTTP
-      HealthCheckTimeoutSeconds: 5
-      HealthyThresholdCount: 3
-      UnhealthyThresholdCount: 5
-      TargetGroupAttributes:
-        - Key: deregistration_delay.timeout_seconds
-          Value: 60
-      VpcId: 
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      Port: 80
-      Protocol: HTTP
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalALBTargetGroup"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-
-  Pattern3ALBListener:
-    Type: AWS::ElasticLoadBalancingV2::Listener
-    Properties:
-      LoadBalancerArn: !Ref Pattern3ALB
-      Port: 80
-      Protocol: HTTP
-      DefaultActions:
-        - Type: forward
-          TargetGroupArn: !Ref Pattern3ALBTargetGroup
-
-#----------------------------------------------------------------------------------------
-# Build load balancer security group.
-#----------------------------------------------------------------------------------------
-  Pattern3ELBSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Enable HTTP from the Internet
-      VpcId: 
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          CidrIp: '0.0.0.0/0'
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref AWS::StackName, "ExternalELBSecurityGroup"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"    
-
-  #----------------------------------------------------------------------------------------
-  # Build instance security group.
-  #----------------------------------------------------------------------------------------
-  Pattern3InstanceSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Enable SSH access and HTTP from the load balancer only
-      VpcId: 
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      SecurityGroupIngress:
-        - IpProtocol: tcp
-          FromPort: 80
-          ToPort: 80
-          SourceSecurityGroupId: !Ref Pattern3ELBSecurityGroup
-      Tags:
-      - Key: Name
-        Value: !Join [ "-", [ !Ref AWS::StackName, "InstanceSecurityGroup"]]
-      - Key: ResourceType
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"  
-  #----------------------------------------------------------------------------------------
-  # Auto Scaling launch Configuration
-  #----------------------------------------------------------------------------------------
-  Pattern3ASGLaunchConfig: 
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Properties: 
-      ImageId: !Ref AmazonMachineImage
-      SecurityGroups: 
-        - !Ref Pattern3InstanceSecurityGroup
-      InstanceType: "m1.large"
-      IamInstanceProfile: !Ref Pattern3Ec2InstanceProfile
-      UserData: 
-        Fn::Base64:
-          !Sub 
-            - |
-                #!/bin/bash -x
-                yum install -y aws-cfn-bootstrap
-                /opt/aws/bin/cfn-init -v --stack=${sub_stackname} --resource=${sub_resource} --configsets=${sub_configsets} --region=${sub_region}
-                /opt/aws/bin/cfn-signal -e $? --stack=${sub_stackname} --resource=${sub_asgresource} --region=${sub_region}
-            - 
-              sub_resource: Pattern3ASGLaunchConfig
-              sub_stackname: !Ref AWS::StackId
-              sub_configsets: provision
-              sub_region: !Ref AWS::Region
-              sub_asgresource: Pattern3ASG
-
-      EbsOptimized: "true"
-    Metadata: 
-      AWS::CloudFormation::Init:
-        configSets: 
-          provision:
-            - "prepare"
-            - "webserver"
-            - "application"
-            - "cfn-hup"
-        prepare:
-          packages:
-            yum: 
-              amazon-linux-extras: []
-        webserver: 
-          packages:
-            yum: 
-              httpd: []
-          commands:
-            enablehttpd:
-              command : "systemctl enable httpd"
-        application: 
-          files: 
-            /var/www/html/index.html: 
-              content: !Sub | 
-                <html> Welcome to Re:Invent 2020 The Well Architected Way <html>
-              mode: "000755"
-              owner: "root"
-              group: "root"
-            /var/www/html/details.php: 
-              content: !Sub | 
-                          <?php
-                            $ami = shell_exec('curl http://169.254.169.254/1.0/meta-data/ami-id');
-                            $installed = shell_exec('yum list installed | sed 1,2d | tr "\n" "#" | sed -e \'s/# / /g\' | tr "#" "\n" | awk \'{print "["$1"] -  {"$2"} -  ("$3")"}\'');
-                            print "<br>";
-                            print "<b>Amazon Image Id: </b> " . $ami . "<br>";
-                            print "<hr>";
-                            print "<br><b>Installed Packages:</b>";
-                            print "<br>";
-                            $ainstalled = explode("\n", $installed);
-                            foreach($ainstalled AS $output)
-                            {
-                                  print "<br>" . $output;
-                            }
-                          ?>
-              mode: "000755"
-              owner: "root"
-              group: "root"
-          commands:
-            load_php_modules:
-              command : "amazon-linux-extras install -y php7.2"
-            starthttpd:
-              command : "systemctl start httpd"
-        cfn-hup:
-          files:
-            /etc/cfn/cfn-hup.conf:
-              content: !Sub |
-                [main]
-                stack=${AWS::StackId}
-                region=${AWS::Region}
-                interval=5
-                verbose=true
-              mode: "000400"
-              owner: "root"
-              group: "root"
-            /etc/cfn/hooks.d/cfn-auto-reloader.conf:
-              content: !Sub |
-                [cfn-auto-reloader-hook]
-                triggers=post.update
-                path=Resources.Pattern3ASGLaunchConfig.Metadata.AWS::CloudFormation::Init
-                action=/opt/aws/bin/cfn-init -v --stack ${AWS::StackId} --resource Instance --configsets provision --region ${AWS::Region}
-                runas=root
-              mode: "000400"
-              owner: "root"
-              group: "root"
-          services:
-            sysvinit:
-              cfn-hup: 
-                enabled: "true"
-                ensureRunning: "true"
-                files:
-                  - /etc/cfn/cfn-hup.conf
-                  - /etc/cfn/hooks.d/cfn-auto-reloader.conf
-
-  #----------------------------------------------------------------------------------------
-  # Auto Scaling Group
-  #----------------------------------------------------------------------------------------
-  Pattern3ASG:
-    Type: AWS::AutoScaling::AutoScalingGroup
-    Properties:
-      # LoadBalancerNames: 
-      #   - !Ref Pattern3ELB
-      TargetGroupARNs:
-        - !Ref Pattern3ALBTargetGroup
-      MinSize: '0'
-      MaxSize: !Ref MaxNumberOfInstanceCluster
-      DesiredCapacity: !Ref NumberOfInstanceCluster
-      LaunchConfigurationName: !Ref Pattern3ASGLaunchConfig
-      HealthCheckType: ELB
-      HealthCheckGracePeriod: 60
-      VPCZoneIdentifier: 
-        - 
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PrivateSubnet1"
-        - 
-          Fn::ImportValue:
-            !Sub "${BaselineVpcStack}-PrivateSubnet2"
-      Tags:
-      - Key: Name
-        PropagateAtLaunch: True
-        Value: !Join [ "-", [ !Ref AWS::StackName, "AutoScalingGroupInstance"]]
-      - Key: ResourceType
-        PropagateAtLaunch: True
-        Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3"
-    UpdatePolicy:
-      AutoScalingReplacingUpdate:
-        WillReplace: True
-    CreationPolicy:
-      ResourceSignal:
-        Count: !Ref NumberOfInstanceCluster
-        Timeout: PT5M
-
-  Pattern3Ec2InstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Path: /
-      Roles: [ !Ref Pattern3Ec2InstanceRole ]
-
-  Pattern3Ec2InstanceRole:
-    Type: AWS::IAM::Role
-    Properties:
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: [ ec2.amazonaws.com ]
-            Action:
-              - sts:AssumeRole
-      Path: /
-
-Outputs:
-  OutputPattern3ALBDNSName:
-    Description: The DNSName of the application load balancer
-    Value: !GetAtt Pattern3ALB.DNSName
-  OutputPattern3ALB:
-    Description: Application Load Balancer
-    Value: !Ref Pattern3ALB
-    Export:
-      Name: !Sub "${AWS::StackName}-ALB"
-  OutputPattern3ELBSecurityGroup:
-    Description: Elastic Load Balancer Security Group
-    Value: !Ref Pattern3ELBSecurityGroup
-    Export:
-      Name: !Sub "${AWS::StackName}-ELBSecurityGroup"
-  OutputPattern3InstanceSecurityGroup:
-    Description: Instance Security Group
-    Value: !Ref Pattern3InstanceSecurityGroup
-    Export:
-      Name: !Sub "${AWS::StackName}-InstanceSecurityGroup"
\ No newline at end of file
diff --git a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section3/pattern3-pipeline.yml b/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section3/pattern3-pipeline.yml
deleted file mode 100644
index 42c59ef3d..000000000
--- a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section3/pattern3-pipeline.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-Parameters:
-  BaselineVpcStack:
-    Type: String
-  MasterAMI:
-    Type: String
-    Default: ami-0f96495a064477ffb
-  Ver:
-    Type: String
-    Default: "1.0.0"
-
-Resources:
-
-  #############
-  # COMPONENTS
-  #############
-
-  ComponentConfigureOS:
-    Type: 'AWS::ImageBuilder::Component'
-    Properties:
-      Name: !Sub "${AWS::StackName}-ConfigureOSComponent"
-      Platform: 'Linux'
-      Version: !Ref Ver
-      Description: 'Configure Operating System Patches'
-      Tags:
-        Name: !Join [ "-", [ !Ref AWS::StackName, "ConfigureOS"]]
-        ResourceType: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3" 
-      Data: |
-        name: ConfigureOS
-        schemaVersion: 1.0
-        phases:
-          - name: build
-            steps:
-              - name: UpdateOS
-                action: UpdateOS
-
-
-  #############
-  # RECIPE
-  #############
-  Pattern3ImageRecipe:
-    Type: 'AWS::ImageBuilder::ImageRecipe'
-    Properties:
-      Name: !Sub "${AWS::StackName}-ImageRecipe"
-      Version: !Ref Ver
-      ParentImage: !Ref MasterAMI
-      Description: !Sub "${AWS::StackName}-ImageRecipe"
-      Components:
-        - ComponentArn: !GetAtt ComponentConfigureOS.Arn
-      Tags:
-        Name: !Join [ "-", [ !Ref AWS::StackName, "Pattern3ImageRecipe"]]
-        ResourceType: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3" 
-
-  ##############
-  # INFRA CONFIG
-  ##############
-
-  Pattern3InfraConfig:
-    Type: 'AWS::ImageBuilder::InfrastructureConfiguration'
-    Properties:
-      Name: !Sub "${AWS::StackName}-InfraConfig" 
-      InstanceProfileName: !Ref Pattern3InstancePfl
-      InstanceTypes:
-        - 'm5.large'
-      TerminateInstanceOnFailure: True
-      SecurityGroupIds:
-        - !Ref Pattern3InstanceSG
-      SubnetId: 
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-PrivateSubnet1"
-      Logging:
-        S3Logs:
-          S3BucketName: !Ref Pattern3LoggingBucket
-          S3KeyPrefix: !Join [ "/", [ 'Pattern3ImagePipeline', !Ref Ver ]]
-      Tags:
-        Name: !Join [ "-", [ !Ref AWS::StackName, "Pattern3InfraConfig"]]
-        ResourceType: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3" 
-
-  Pattern3LoggingBucket:
-    Type: AWS::S3::Bucket
-
-  Pattern3InstanceSG:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Enable SSH access and HTTP from the load balancer only
-      VpcId: 
-        Fn::ImportValue:
-          !Sub "${BaselineVpcStack}-VpcId"
-      Tags:
-        - Key: Name
-          Value: !Join [ "-", [ !Ref AWS::StackName, "BuildAMIInstanceSecurityGroup"]]
-        - Key: ResourceType
-          Value: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3" 
-
-  Pattern3InstancePfl: 
-    Type: "AWS::IAM::InstanceProfile"
-    Properties: 
-      Path: "/"
-      Roles: 
-        - !Ref Pattern3InstanceRole
-
-  Pattern3InstanceRole:
-    Type: AWS::IAM::Role
-    Properties:
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
-        - arn:aws:iam::aws:policy/EC2InstanceProfileForImageBuilder
-        - arn:aws:iam::aws:policy/AmazonS3FullAccess
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: [ ec2.amazonaws.com ]
-            Action:
-              - sts:AssumeRole
-      Path: /
-
-  ##############
-  # PIPELINE
-  ##############
-
-  Pattern3ImagePipeline:
-    Type: 'AWS::ImageBuilder::ImagePipeline'
-    Properties:
-      Name: !Sub "${AWS::StackName}-ImagePipeline"
-      Description: 'Pipeline to build Golden AMI - Re:Invent 2020 Lab'
-      ImageRecipeArn: !Ref Pattern3ImageRecipe
-      InfrastructureConfigurationArn: !Ref Pattern3InfraConfig
-      ImageTestsConfiguration:
-        ImageTestsEnabled: false
-        TimeoutMinutes: 90
-      Status: 'ENABLED'
-      Tags:
-        Name: !Join [ "-", [ !Ref AWS::StackName, "Pattern3ImagePipeline"]]
-        ResourceType: "ReInvent2020-SecurityTheWellArchitectedWay-Pattern3" 
-
-Outputs:
-  Pattern3ImagePipeline:
-    Description: Image Builder Pipeline
-    Value: !Ref Pattern3ImagePipeline
-    Export:
-      Name: !Sub "${AWS::StackName}-ImageBuilderPipeline"
\ No newline at end of file
diff --git a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section4/pattern3-automate.yml b/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section4/pattern3-automate.yml
deleted file mode 100644
index e7c411c29..000000000
--- a/static/Security/300_Autonomous_Patching_With_EC2_Image_Builder_and_Systems_Manager/Code/templates/section4/pattern3-automate.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-Parameters:
-  ImageBuilderPipelineStack:
-    Type: String
-  ApplicationStack:
-    Type: String
-Outputs:
-  Pattern3CreateImageOutput:
-    Description: Image Creation SSM Document 
-    Value: !Ref Pattern3CreateImage
-Resources:
-  Pattern3CreateImage: 
-    Type: "AWS::SSM::Document"
-    Properties:
-      DocumentType: Automation
-      Content: 
-        description: CreateImage
-        schemaVersion: '0.3'
-        parameters:
-          ImageBuilderPipeline:
-            default: 
-              Fn::ImportValue:
-                !Sub "${ImageBuilderPipelineStack}-ImageBuilderPipeline"
-            description: (Required) Corresponding EC2 Image Builder Pipeline to execute.
-            type: String
-          ApplicationStack:
-            default: !Ref ApplicationStack
-            description: (Required) Corresponding Application Stack to Deploy the Image to.
-            type: String
-        mainSteps:
-          - name: ExecuteImageCreation
-            action: aws:executeAwsApi
-            maxAttempts: 10
-            timeoutSeconds: 3600
-            onFailure: Abort
-            inputs:
-              Service: imagebuilder
-              Api: StartImagePipelineExecution
-              imagePipelineArn: '{{ ImageBuilderPipeline }}'
-            outputs:
-            - Name: imageBuildVersionArn
-              Selector: $.imageBuildVersionArn
-              Type: String
-          - name: WaitImageComplete
-            action: aws:waitForAwsResourceProperty
-            maxAttempts: 10
-            timeoutSeconds: 3600
-            onFailure: Abort
-            inputs:
-              Service: imagebuilder
-              Api: GetImage
-              imageBuildVersionArn: '{{ ExecuteImageCreation.imageBuildVersionArn }}'
-              PropertySelector: image.state.status
-              DesiredValues: 
-                - AVAILABLE
-          - name: GetBuiltImage
-            action: aws:executeAwsApi
-            maxAttempts: 10
-            timeoutSeconds: 3600
-            onFailure: Abort
-            inputs:
-              Service: imagebuilder
-              Api: GetImage         
-              imageBuildVersionArn: '{{ ExecuteImageCreation.imageBuildVersionArn }}'
-            outputs:
-            - Name: image
-              Selector: $.image.outputResources.amis[0].image
-              Type: String
-          - name: UpdateCluster
-            action: aws:executeAwsApi
-            maxAttempts: 10
-            timeoutSeconds: 3600
-            onFailure: Abort
-            inputs:
-              Service: cloudformation
-              Api: UpdateStack
-              StackName: '{{ ApplicationStack }}'
-              UsePreviousTemplate: true
-              Parameters:
-                - ParameterKey: BaselineVpcStack
-                  UsePreviousValue: true
-                - ParameterKey: AmazonMachineImage
-                  ParameterValue: '{{ GetBuiltImage.image }}'
-              Capabilities:
-                - CAPABILITY_IAM
-          - name: WaitDeploymentComplete
-            action: aws:waitForAwsResourceProperty
-            maxAttempts: 10
-            timeoutSeconds: 3600
-            onFailure: Abort
-            inputs:
-              Service: cloudformation
-              Api: DescribeStacks
-              StackName: '{{ ApplicationStack }}'
-              PropertySelector: Stacks[0].StackStatus
-              DesiredValues: 
-                - UPDATE_COMPLETE
-
diff --git a/static/Security/300_Identify_detect_and_notify_sensitive_data_leakage _using_Amazon_Macie/code/Identify-detect-sensitive-data-leakage-Macie.yml b/static/Security/300_Identify_detect_and_notify_sensitive_data_leakage _using_Amazon_Macie/code/Identify-detect-sensitive-data-leakage-Macie.yml
deleted file mode 100644
index 387c17ee6..000000000
--- a/static/Security/300_Identify_detect_and_notify_sensitive_data_leakage _using_Amazon_Macie/code/Identify-detect-sensitive-data-leakage-Macie.yml	
+++ /dev/null
@@ -1,343 +0,0 @@
-Parameters:
-  pSNSEmailAddress:
-    Type: String
-    Description: "Enter the email address where Macie Findings will be sent to (Note: Will have to accept SNS subscription prior to creation of Macie Findings in order to receive them.)"
-    MinLength: 5
-
-Resources:
-  S3Queue: 
-    Type: 'AWS::SQS::Queue'
-    Properties: 
-      DelaySeconds: 0
-      VisibilityTimeout: 120
-
-  LoggingBucket:
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      AccessControl: LogDeliveryWrite
-
-  StartBucket:
-    DependsOn: 
-      - S3Queue
-      - EventQueuePolicy
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      AccessControl: Private
-      LoggingConfiguration:
-        DestinationBucketName: !Ref LoggingBucket
-        LogFilePrefix: testing-logs
-      BucketName: !Join
-        - "-"
-        - - "macie-test-bucket"
-          - !Select
-            - 2
-            - !Split
-              - "/"
-              - !Ref "AWS::StackId"
-      NotificationConfiguration:
-        QueueConfigurations:
-          - Event: s3:ObjectCreated:*
-            Queue: !GetAtt S3Queue.Arn
-            
-            
-  EventQueuePolicy:
-    Type: AWS::SQS::QueuePolicy
-    DependsOn:
-      - S3Queue
-    Properties:
-      PolicyDocument:
-        Id:  EventQueuePolicy
-        Version: '2012-10-17'
-        Statement:
-          - Sid: Send_Permission
-            Effect: Allow
-            Principal:
-              Service:
-                - s3.amazonaws.com
-            Action:
-              - sqs:SendMessage
-            Resource: !GetAtt S3Queue.Arn
-            Condition:
-              ArnLike:
-                aws:SourceArn: !Join
-                  - "-"
-                  - - "arn:aws:s3:::macie-test-bucket"
-                    - !Select
-                      - 2
-                      - !Split
-                        - "/"
-                        - !Ref "AWS::StackId"
-      Queues:
-        - !Ref S3Queue
-          
-  SQSLambdaExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - lambda.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: sqsLambdaLogs
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - logs:CreateLogGroup
-            - logs:CreateLogStream
-            - logs:PutLogEvents
-            Resource: arn:aws:logs:*:*:*
-      - PolicyName: sqsLambdaSQSPermissions
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - sqs:ReceiveMessage
-            - sqs:DeleteMessage
-            - sqs:GetQueueAttributes
-            - sqs:ChangeMessageVisibility
-            Resource: !GetAtt S3Queue.Arn
-      - PolicyName: macie2JobPermissions
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - macie2:CreateClassificationJob
-            Resource: "arn:aws:macie2:*:*:classification-job/*"
-            
-      
-  SQSLambda:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Handler: index.lambda_handler
-      Timeout: 120
-      Role: !GetAtt SQSLambdaExecutionRole.Arn
-      Code:
-        ZipFile: |
-          import json
-          import boto3
-          import os
-          import logging
-          import traceback
-          import time
-          from urllib.parse import unquote_plus
-          
-          def lambda_handler(event, context):
-              print(f'Event: {json.dumps(event)}')
-              
-              receiptHandle=event['Records'][0]['receiptHandle']
-              bodyString=event['Records'][0]['body']
-              eventSource=event['Records'][0]['eventSource']
-              eventSourceARN=event['Records'][0]['eventSourceARN']
-              
-              if eventSource == 'aws:sqs':
-                  
-                  body=json.loads(bodyString)
-                  print(f'Body: {body}')
-                  
-                  try:
-                      bodyEventSource=body['Records'][0]['eventSource']
-                      bodyEventName=body['Records'][0]['eventName']
-                      bodyUserIdentity=body['Records'][0]['userIdentity']['principalId']
-                      
-                      bodyS3Bucket=body['Records'][0]['s3']['bucket']['name']
-                      bodyObjectKey=unquote_plus(body['Records'][0]['s3']['object']['key'])
-                      
-                      sourceAccountNumber=eventSourceARN.split(":")[4]
-                      
-                      macieName=bodyObjectKey+str(int(time.time()))
-                      
-                      client = boto3.client('macie2')
-                      response = client.create_classification_job(
-                          description='macie',
-                          initialRun=True,
-                          jobType='ONE_TIME',
-                          name=macieName,
-                          s3JobDefinition={
-                              'bucketDefinitions': [
-                                  {
-                                      'accountId': sourceAccountNumber,
-                                      'buckets': [ bodyS3Bucket ]
-                                  }
-                              ],
-                              'scoping': {
-                                  'includes': {
-                                      'and': [
-                                          {
-                                              'simpleScopeTerm': {
-                                                  'comparator': 'STARTS_WITH',
-                                                  'key': 'OBJECT_KEY',
-                                                  'values': [
-                                                      bodyObjectKey,
-                                                  ]
-                                              }
-                                          },
-                                      ]
-                                  }
-                              }
-                          }
-                      )
-                      
-                      # TODO implement
-                      return {
-                      'statusCode': 200,
-                      'body': json.dumps('Processed message from queue and created Macie job.')
-                      }
-                  except:
-                      return {
-                      'statusCode': 500,
-                      'body': json.dumps('Could not process from queue. May have been an S3 test event.')
-                      } 
-              else:
-                  return {
-                  'statusCode': 500,
-                  'body': json.dumps('Failure to get message from queue.')
-                  }
-
-
-  LambdaFunctionEventSourceMapping:
-    Type: AWS::Lambda::EventSourceMapping
-    Properties:
-      BatchSize: 1
-      Enabled: true
-      EventSourceArn: !GetAtt S3Queue.Arn
-      FunctionName: !GetAtt SQSLambda.Arn
-            
-            
-
-  MacieSession:
-    Type: AWS::Macie::Session
-    Properties:
-      FindingPublishingFrequency: FIFTEEN_MINUTES
-      Status: ENABLED
-      
-  MacieLambdaExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - lambda.amazonaws.com
-          Action:
-          - sts:AssumeRole
-      Path: "/"
-      Policies:
-      - PolicyName: snsLambdaLogs
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - logs:CreateLogGroup
-            - logs:CreateLogStream
-            - logs:PutLogEvents
-            Resource: arn:aws:logs:*:*:*
-      - PolicyName: macieLambdaSNSPermissions
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - sns:Publish
-            Resource: !Ref MacieSNSTopic
-  
-  EventLambda:
-    Type: AWS::Lambda::Function
-    Properties:
-      Runtime: python3.9
-      Handler: index.lambda_handler
-      Timeout: 120
-      Role: !GetAtt MacieLambdaExecutionRole.Arn
-      Environment:
-        Variables:
-          SNS_TOPIC_ARN: !Ref MacieSNSTopic
-      Code:
-        ZipFile: |
-            import json
-            import boto3
-            import os
-            import logging
-            import traceback
-            
-            def lambda_handler(event, context):
-            
-              score=event['detail']['severity']['score']
-              
-              type=event['detail']['type']
-              
-              fileAndPath=event['detail']['resourcesAffected']['s3Object']['path']
-              
-              print(fileAndPath)
-              
-              snsMessage = f"Found event of type: {type} for file: {fileAndPath}"
-              client = boto3.client('sns')
-              response = client.publish (
-                TargetArn = os.environ.get('SNS_TOPIC_ARN'),
-                Message = json.dumps({'default': snsMessage}),
-                MessageStructure = 'json',
-                Subject = 'Macie Event Finding'
-              )
-              
-              # TODO implement
-              return {
-                'statusCode': 200,
-                'body': json.dumps('Macie SNS sent.')
-              }
-            
-  MacieEventsRule:
-    DependsOn: EventLambda
-    Type: 'AWS::Events::Rule'
-    Properties:
-      Name: MacieEventsRule
-      Description: 'EventBridge Event Rule to enable Macie Findings in SNS '
-      State: ENABLED
-      EventPattern:
-        source: 
-          - "aws.macie"
-        detail-type: 
-          - "Macie Finding"
-      State: "ENABLED"
-      Targets:
-        - Arn: !GetAtt 
-            - EventLambda
-            - Arn
-          Id: MacieEventsRule
-          
-  LambdaInvokePermission:
-    DependsOn:
-      - EventLambda
-      - MacieEventsRule
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:InvokeFunction'
-      Principal: events.amazonaws.com
-      FunctionName: !GetAtt 
-        - EventLambda
-        - Arn
-      SourceArn: !GetAtt 
-        - MacieEventsRule
-        - Arn
-          
-  MacieSNSTopic:
-    Type: AWS::SNS::Topic
-    Properties:
-      DisplayName: "Macie Event Finding"
-      Subscription:
-      - Endpoint: !Ref pSNSEmailAddress
-        Protocol: email
-        
-  EnableSecurityHub:
-    Type: 'AWS::SecurityHub::Hub'
diff --git a/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml b/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml
deleted file mode 100644
index c586ec97b..000000000
--- a/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml
+++ /dev/null
@@ -1,578 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: WA Lab environment
-
-Parameters:
-  SBucketName:
-    Type: String
-    Description: S3 Bucket where you upload 3 Lambda deployment packages (.zip file)
-  RDSDBName:
-    Type: String
-    Description: database name
-    Default: playersdb
-  DBTableName:
-    Type: String
-    Description: table name
-    Default: players
-  RDSUserName:
-    Type: String
-    Description: database userman
-    Default: admin
-
-Resources:
-
-  # create VPC
-  RDSVPC:
-    Type: AWS::EC2::VPC
-    Properties:
-        CidrBlock: 10.0.0.0/16
-        EnableDnsSupport: 'true'
-        EnableDnsHostnames: 'true'
-        Tags:
-        - Key: Name
-          Value: RDSVPC
-
-  # create subnets
-  WAprivateDBSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref RDSVPC
-      CidrBlock: 10.0.1.0/24
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-        - Key: Name
-          Value: WAprivateDBSubnet1
-
-  WAprivateDBSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref RDSVPC
-      CidrBlock: 10.0.2.0/24
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-      - Key: Name
-        Value: WAprivateDBSubnet2
-
-  WAprivateLambdaSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref RDSVPC
-      CidrBlock: 10.0.3.0/24
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-      - Key: Name
-        Value: WAprivateLambdaSubnet1
-
-  WAprivateLambdaSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref RDSVPC
-      CidrBlock: 10.0.4.0/24
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-      - Key: Name
-        Value: WAprivateLambdaSubnet2
-
-  WApublicSubnet1:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref RDSVPC
-      CidrBlock: 10.0.5.0/24
-      AvailabilityZone: !Select
-        - 0
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-      - Key: Name
-        Value: WApublicSubnet1
-
-  WApublicSubnet2:
-    Type: AWS::EC2::Subnet
-    Properties:
-      VpcId: !Ref RDSVPC
-      CidrBlock: 10.0.6.0/24
-      AvailabilityZone: !Select
-        - 1
-        - !GetAZs
-          Ref: 'AWS::Region'
-      Tags:
-      - Key: Name
-        Value: WApublicSubnet2
-
-  # create and attach internet gateway
-  # Internet gatewat and NAT are required so that Lambdas running inside VPC can invoke ManageConnections lambda function (running out of VPC)
-  WAInternetGateway:
-    Type: AWS::EC2::InternetGateway
-    Properties:
-      Tags:
-        - Key: Name
-          Value: WAInternetGateway
-
-  AttachInternetGateway:
-    DependsOn: WAInternetGateway
-    Type: AWS::EC2::VPCGatewayAttachment
-    Properties:
-      VpcId: !Ref RDSVPC
-      InternetGatewayId: !Ref WAInternetGateway
-
-  # create route tables
-  CustomRouteTable:
-    DependsOn: AttachInternetGateway
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref RDSVPC
-      Tags:
-      - Key: Name
-        Value: CustomRouteTable
-
-  WARouteTable:
-    Type: AWS::EC2::RouteTable
-    Properties:
-      VpcId: !Ref RDSVPC
-      Tags:
-      - Key: Name
-        Value: WARouteTable
-
-  # attach route tables
-  WASubnetRouteTableAssociation1:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref WAprivateDBSubnet1
-      RouteTableId: !Ref WARouteTable
-
-  WASubnetRouteTableAssociation2:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref WAprivateDBSubnet2
-      RouteTableId: !Ref WARouteTable
-
-  WASubnetRouteTableAssociation3:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref WAprivateLambdaSubnet1
-      RouteTableId: !Ref WARouteTable
-
-  WASubnetRouteTableAssociation4:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref WAprivateLambdaSubnet2
-      RouteTableId: !Ref WARouteTable
-
-  # public subnets get attached to CustomRouteTable
-  WASubnetRouteTableAssociation5:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref WApublicSubnet1
-      RouteTableId: !Ref CustomRouteTable
-
-  WASubnetRouteTableAssociation6:
-    Type: AWS::EC2::SubnetRouteTableAssociation
-    Properties:
-      SubnetId: !Ref WApublicSubnet2
-      RouteTableId: !Ref CustomRouteTable
-
-  # create and attach NAT gateway
-  WANAT:
-    DependsOn: RDSVPC
-    Type: AWS::EC2::NatGateway
-    Properties:
-      AllocationId: !GetAtt [WAEIP,AllocationId]
-      SubnetId: !Ref WApublicSubnet1
-
-  WAEIP:
-    DependsOn: AttachInternetGateway
-    Type: AWS::EC2::EIP
-    Properties:
-      Domain: vpc
-
-  # create routes
-
-  RouteToNAT:
-    Type: AWS::EC2::Route
-    Properties:
-      RouteTableId: !Ref WARouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      NatGatewayId: !Ref WANAT
-
-  RouteToInternet:
-    Type: AWS::EC2::Route
-    Properties:
-      RouteTableId: !Ref CustomRouteTable
-      DestinationCidrBlock: 0.0.0.0/0
-      GatewayId: !Ref WAInternetGateway
-
-  # create security groups
-  # Only allow Lambda security group
-  RDSSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Allow WA SQL access from lambda subnets
-      VpcId:
-        Ref: RDSVPC
-      SecurityGroupIngress:
-      - IpProtocol: tcp
-        FromPort: '3306'
-        ToPort: '3306'
-        SourceSecurityGroupId : !Ref LambdaSecurityGroup
-      Tags:
-      - Key: Name
-        Value: RDSSecurityGroup
-
-  LambdaSecurityGroup:
-    Type: AWS::EC2::SecurityGroup
-    Properties:
-      GroupDescription: Security group for Lambda ENIs
-      VpcId:
-        Ref: RDSVPC
-      Tags:
-      - Key: Name
-        Value: LambdaSecurityGroup
-
-  # Create Db subnet groups for RDS instance
-  WADBSubnetGroup:
-    Type: AWS::RDS::DBSubnetGroup
-    Properties:
-      DBSubnetGroupDescription: 'RDS subnets'
-      SubnetIds:
-        - !Ref WAprivateDBSubnet1
-        - !Ref WAprivateDBSubnet2
-      Tags:
-        -
-          Key: Name
-          Value: WADBSubnetGroup
-  # Will be assumed by RDSLambdaCFNInit Lambda function
-  RDSLambdaCFNInitRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          -
-            Effect: 'Allow'
-            Principal:
-              Service:
-              - lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Path: '/'
-      Policies:
-        -
-          PolicyName: 'AllowSM'
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: 'Allow'
-                Action: 'secretsmanager:*'
-                Resource: '*'
-        -
-          PolicyName: 'AllowS3'
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: 'Allow'
-                Action: 's3:*'
-                Resource: '*'
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole
-
-  # Will be assumed by LambdaRDSTest and LambdaRDSTestHarness Lambda functions
-  RDSLambdaTestRole:
-    Type: 'AWS::IAM::Role'
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-          -
-            Effect: 'Allow'
-            Principal:
-              Service:
-              - lambda.amazonaws.com
-            Action: 'sts:AssumeRole'
-      Path: '/'
-      Policies:
-        -
-          PolicyName: 'AllowS3'
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: 'Allow'
-                Action: 's3:*'
-                Resource: '*'
-        -
-          PolicyName: 'AllowSM'
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: 'Allow'
-                Action: 'secretsmanager:*'
-                Resource: '*'
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole
-
-  LambdaRDSTest:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: lambda_function.lambda_handler
-      Description: 'Test Lambda function to access a RDS Database and read sample data'
-      Runtime: python3.8
-      #CodeUri: 's3://walabscode/rds-query.zip'
-      CodeUri:
-        Bucket: !Ref SBucketName
-        Key: rds-query.zip
-      Role: !GetAtt RDSLambdaTestRole.Arn
-      MemorySize: 128
-      Timeout: 60
-      Events:
-        GetEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-      VpcConfig: # For accessing RDS instance
-        SecurityGroupIds:
-          - !Ref LambdaSecurityGroup
-        SubnetIds:
-          - !Ref WAprivateLambdaSubnet1
-          - !Ref WAprivateLambdaSubnet2
-      Environment:
-        Variables:
-          RDS_HOST: !GetAtt WADBInstance.Endpoint.Address
-          RDS_USERNAME: !Ref RDSUserName
-          SECRET_NAME: !Ref WARDSInstanceRotationSecret
-          RDS_DB_NAME: !Ref RDSDBName
-          RDS_Table_NAME: !Ref DBTableName
-          #RDS_DB_NAME: 'playersdb'
-
-  apiGateway:
-    Type: 'AWS::ApiGateway::RestApi'
-    Properties:
-      Name: 'wa-lab-rds-api'
-      Description: 'WA API Gateway'
-      EndpointConfiguration:
-        Types:
-          - REGIONAL
-      Tags:
-      - Key: Name
-        Value: apiGateway
-
-  apiGatewayRootMethod:
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      AuthorizationType: 'NONE'
-      HttpMethod: 'GET'
-      ResourceId: !GetAtt 'apiGateway.RootResourceId'
-      RestApiId: !Ref 'apiGateway'
-      RequestValidatorId: !Ref apiRequestValidator
-      MethodResponses:
-      - StatusCode: 200
-        ResponseModels:
-          application/json: Empty
-        ResponseParameters:
-          method.response.header.Content-Type: true
-          method.response.header.Content-Length: true
-      RequestParameters:
-        method.request.querystring.id: true
-      Integration:
-        IntegrationHttpMethod: 'POST'  # https://aws.amazon.com/premiumsupport/knowledge-center/api-gateway-lambda-template-invoke-error/
-        Type: 'AWS'
-        Uri: !Sub
-          - 'arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${lambdaArn}/invocations'
-          - lambdaArn: !GetAtt 'LambdaRDSTest.Arn'
-        IntegrationResponses:
-        - StatusCode: 200
-          ResponseParameters:
-            method.response.header.Content-Type: integration.response.body.headers.Content-Type
-            method.response.header.Content-Length: integration.response.body.headers.Content-Length
-          ResponseTemplates:
-            application/json: $input.path('$')
-        PassthroughBehavior: WHEN_NO_TEMPLATES
-        RequestTemplates: #Accept Query String
-          application/json: !Join
-            - ''
-            - -  "{\n \"id\": \"$input.params('id')\"  \n}"
-
-  # add request validator in console
-  apiRequestValidator:
-    Type: AWS::ApiGateway::RequestValidator
-    Properties:
-      RestApiId: !Ref apiGateway
-      ValidateRequestParameters: true
-
-  apiGatewayDeployment:
-    Type: 'AWS::ApiGateway::Deployment'
-    DependsOn:
-      - 'apiGatewayRootMethod'
-    Properties:
-      RestApiId: !Ref 'apiGateway'
-      StageName: 'Dev'
-
-  # Allow API Gateway to invoke LambdaRDSTest
-  lambdaApiGatewayInvoke:
-    Type: 'AWS::Lambda::Permission'
-    Properties:
-      Action: 'lambda:InvokeFunction'
-      FunctionName: !GetAtt 'LambdaRDSTest.Arn'
-      Principal: 'apigateway.amazonaws.com'
-      SourceArn: !Sub 'arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${apiGateway}/*/GET/'
-
-  LambdaRDSCreateTable:
-    DependsOn:
-      - WAEIP # for deletion, this lambda function requires access to S3 bucket, hence this dependency. (chained to NAT and internet gateway)
-      - WASubnetRouteTableAssociation1
-      - WASubnetRouteTableAssociation2
-      - WASubnetRouteTableAssociation3
-      - WASubnetRouteTableAssociation4
-      - WASubnetRouteTableAssociation5
-      - WASubnetRouteTableAssociation6
-      - RouteToInternet
-      - RouteToNAT
-      - RDSSecurityGroup
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: lambda_function.lambda_handler
-      Description: 'Lambda function which will execute when this CFN template is created, updated or deleted'
-      Runtime: python3.8
-      #CodeUri: 's3://walabscode/rds-create-table.zip'
-      CodeUri:
-        Bucket: !Ref SBucketName
-        Key: rds-create-table.zip
-      Role: !GetAtt RDSLambdaCFNInitRole.Arn
-      MemorySize: 128
-      Timeout: 60
-      VpcConfig: # For accessing RDS instance
-        SecurityGroupIds:
-          - !Ref LambdaSecurityGroup
-        SubnetIds:
-          - !Ref WAprivateLambdaSubnet1
-          - !Ref WAprivateLambdaSubnet2
-      Environment:
-        Variables:
-          RDS_HOST: !GetAtt WADBInstance.Endpoint.Address
-          RDS_USERNAME: !Ref RDSUserName
-          SECRET_NAME: !Ref WARDSInstanceRotationSecret
-          RDS_DB_NAME: !Ref RDSDBName
-          RDS_Table_NAME: !Ref DBTableName
-
-  InvokeLambdaRDSCreateTable:
-    Type: AWS::CloudFormation::CustomResource
-    Version: '1.0'
-    Properties:
-      ServiceToken: !GetAtt LambdaRDSCreateTable.Arn
-
-  #grant access to CloudFormation-specific S3 buckets for resources in a VPC that must respond to a custom resource request or a wait condition.
-  CloudFormationEndpoint:
-    Type: AWS::EC2::VPCEndpoint
-    Properties:
-      PrivateDnsEnabled: true
-      SecurityGroupIds:
-        - !Ref LambdaSecurityGroup
-      ServiceName: !Sub "com.amazonaws.${AWS::Region}.cloudformation"
-      SubnetIds:
-        - !Ref WAprivateLambdaSubnet1
-        - !Ref WAprivateLambdaSubnet2
-      VpcEndpointType: 'Interface'
-      VpcId: !Ref RDSVPC
-
-  #This is a Secret resource with a randomly generated password in its SecretString JSON.
-  WARDSInstanceRotationSecret:
-    Type: AWS::SecretsManager::Secret
-    Properties:
-      Description: 'RDS MySQL password'
-      GenerateSecretString:
-        #SecretStringTemplate: !Sub '{"username": "admin"}'
-        SecretStringTemplate: !Sub '{"username": "${RDSUserName}"}'
-        GenerateStringKey: 'password'
-        PasswordLength: 16
-        ExcludeCharacters: '"@/\'
-      Tags:
-        -
-          Key: Name
-          Value: WARDSPassword
-
-  #This is a RDS instance resource. Its master username and password use dynamic references to resolve values from SecretsManager.
-  #The dynamic reference guarantees that CloudFormation will not log or persist the resolved value
-  #We use a ref to the Secret resource logical id in order to construct the dynamic reference, since the Secret name is being
-  #generated by CloudFormation
-  WADBInstance:
-    Type: AWS::RDS::DBInstance
-    Properties:
-      AllocatedStorage: 20
-      DBInstanceClass: db.t3.micro
-      DBName: !Ref RDSDBName
-      Engine: mysql
-      MasterUsername: !Ref RDSUserName
-      MasterUserPassword: !Join ['', ['{{resolve:secretsmanager:', !Ref WARDSInstanceRotationSecret, ':SecretString:password}}' ]]
-      MultiAZ: False
-      PubliclyAccessible: False
-      StorageType: gp2
-      DBSubnetGroupName: !Ref WADBSubnetGroup
-      VPCSecurityGroups:
-        - !Ref RDSSecurityGroup
-      BackupRetentionPeriod: 0
-      DBInstanceIdentifier: 'WA-lab-mysql-RDS'
-      Tags:
-      - Key: Name
-        Value: WADBInstance
-
-  #This is a SecretTargetAttachment resource which updates the referenced Secret resource with properties about
-  #the referenced RDS instance
-  SecretRDSInstanceAttachment:
-    Type: AWS::SecretsManager::SecretTargetAttachment
-    Properties:
-      SecretId: !Ref WARDSInstanceRotationSecret
-      TargetId: !Ref WADBInstance
-      TargetType: AWS::RDS::DBInstance
-
-  #Cloud9 to provide IDE
-  Cloud9:
-    Type: 'AWS::Cloud9::EnvironmentEC2'
-    Properties:
-      Name: !Sub '${AWS::StackName}-Cloud9-IDE'
-      Description: 'Cloud9 Environment for WA Lab'
-      AutomaticStopTimeMinutes: 30
-      SubnetId: !Ref WApublicSubnet1
-      InstanceType: 't2.micro'
-      Repositories:
-        - PathComponent: /walab-scripts
-          RepositoryUrl: 'https://github.com/awswa/walab-scripts.git'
-
-Outputs:
-  APIGatewayURL:
-    Description: URL of your API endpoint
-    Value: !Join
-      - ''
-      - - https://
-        - !Ref apiGateway
-        - '.execute-api.'
-        - !Ref 'AWS::Region'
-        - '.amazonaws.com/Dev/?id=1'
-  RDSMysqlSecret:
-    Description: Secrets Manager Secret for RDS Mysql
-    Value: !Sub https://console.aws.amazon.com/secretsmanager/home?region=${AWS::Region}#/secret?name=${WARDSInstanceRotationSecret}
-  RDS:
-    Description: RDS Mysql
-    Value: !Sub https://console.aws.amazon.com/rds/home?region=${AWS::Region}#database:id=${WADBInstance};is-cluster=false
-  Cloud9URL:
-    Description: Cloud9 Environment
-    Value:
-      Fn::Join:
-      - ''
-      - - !Sub https://${AWS::Region}.console.aws.amazon.com/cloud9/ide/
-        - !Ref 'Cloud9'
\ No newline at end of file
diff --git a/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section3/section3-enhance_security.yaml b/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section3/section3-enhance_security.yaml
deleted file mode 100644
index 8ad08283d..000000000
--- a/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section3/section3-enhance_security.yaml
+++ /dev/null
@@ -1,353 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: CloudFront origin security with Cognito, AWS WAF and AWS Secrets Manager
-
-Parameters:
-  SBucketName:
-    Type: String
-    Description: S3 Bucket where you upload 3 Lambda deployment packages (.zip file)
-  ApiGatewayURL:
-    Type: String
-    Description: Your API's invoke URL WITH stage name
-  HeaderName:
-    Default: X-Origin-Verify
-    Description: Header name for secret string.
-    Type: String
-  WAFRulePriority:
-    Default: "0"
-    Description: Rule number to use for regional WAF web ACL. 0 is recommended.
-    Type: Number
-
-Resources:
-  # Cognito for API Gateway Authorization
-  WAUserPool:
-    Type: 'AWS::Cognito::UserPool'
-    Properties:
-      UserPoolName: !Join
-        - ''
-        - - WAUserPool-
-          - !Select [2, !Split ['/', !Ref AWS::StackId]]
-      AutoVerifiedAttributes:
-        - email
-      UsernameAttributes:
-        - email
-      Schema:
-        - AttributeDataType: String
-          Name: email
-          Required: true
-      VerificationMessageTemplate:
-        DefaultEmailOption: CONFIRM_WITH_LINK
-  WAUserPoolClient:
-    Type: 'AWS::Cognito::UserPoolClient'
-    Properties:
-      ClientName: !Join
-        - ''
-        - - WAUserPoolClient-
-          - !Select [2, !Split ['/', !Ref AWS::StackId]]
-      GenerateSecret: true
-      UserPoolId: !Ref WAUserPool
-      AllowedOAuthFlows:
-          - code
-          - implicit
-      AllowedOAuthFlowsUserPoolClient: true
-      AllowedOAuthScopes:
-        - email
-        - openid
-        - aws.cognito.signin.user.admin
-      CallbackURLs:
-        - 'https://example.com/callback'
-      DefaultRedirectURI: 'https://example.com/callback'
-      ExplicitAuthFlows:
-        - ALLOW_ADMIN_USER_PASSWORD_AUTH
-        - ALLOW_CUSTOM_AUTH
-        - ALLOW_USER_SRP_AUTH
-        - ALLOW_REFRESH_TOKEN_AUTH
-      LogoutURLs:
-        - 'https://example.com/signout'
-      UserPoolId: !Ref WAUserPool
-      SupportedIdentityProviders:
-        - COGNITO
-      PreventUserExistenceErrors: ENABLED
-  WACognitoUserPoUserPoolDomain:
-    Type: AWS::Cognito::UserPoolDomain
-    Properties:
-      UserPoolId: !Ref WAUserPool
-      Domain: !Join
-        - ''
-        - - walab-
-          - !Select [2, !Split ['/', !Ref AWS::StackId]]
-
-  # Reference: https://github.com/aws-samples/amazon-cloudfront-waf-secretsmanager
-  # CLOUDFRONT DISTRIBUTION with origin custom header
-  CloudFrontDistribution:
-    Type: 'AWS::CloudFront::Distribution'
-    #DependsOn: apiGateway
-    Properties:
-      DistributionConfig:
-        Comment: 'CDN with Origin Custom Header generated by Secrets Manager'
-        WebACLId: !GetAtt wafACLG.Arn
-        Origins:
-          #- DomainName: !Select [1, !Split ['//', !Ref ApiGatewayURL]]
-          - DomainName: !Select [2, !Split ['/', !Ref ApiGatewayURL]]  #without :: and stage name
-            OriginPath: !Sub  #stage name as path
-              - '/${stage}'
-              - stage: !Select [3, !Split ['/', !Ref ApiGatewayURL]]
-            Id: !Sub
-              - "Custom-${apiurl}"
-              - apiurl: !Select [2, !Split ['/', !Ref ApiGatewayURL]]
-            CustomOriginConfig:
-              HTTPPort: '80'
-              HTTPSPort: '443'
-              OriginSSLProtocols:
-                - TLSv1.2
-              OriginProtocolPolicy: https-only  #API Gateway doesn't support unencrypted (HTTP) endpoints
-            # User will complete the following custom header in console
-            #OriginCustomHeaders:
-            #  - HeaderName: !Ref HeaderName
-            #    HeaderValue: !Join ['', ['{{resolve:secretsmanager:', !Ref OriginVerifyHeader, ':SecretString:HEADERVALUE}}' ]]
-
-        Enabled: true
-        HttpVersion: 'http2'
-        DefaultCacheBehavior:
-          AllowedMethods:
-            - GET
-            - HEAD
-            #- DELETE
-            #- OPTIONS
-            #- PATCH
-            #- POST
-            #- PUT
-          SmoothStreaming: false
-          TargetOriginId: !Sub
-              - "Custom-${apiurl}"
-              - apiurl: !Select [2, !Split ['/', !Ref ApiGatewayURL]]
-          ForwardedValues:
-            #API Gateway needs Authorization header with ID token generated by Cognito
-            #Headers:
-            #  - Authorization
-
-            # accept query string
-            QueryString: true
-          ViewerProtocolPolicy: redirect-to-https
-  # generate random X-Origin-Verify header value using Secrets Manager
-  OriginVerifyHeader:
-    Type: 'AWS::SecretsManager::Secret'
-    Description: 'Randomly generated header'
-    Properties:
-      Description: 'Origin Custom Header value for CloudFront'
-      GenerateSecretString:
-        SecretStringTemplate: !Sub '{"HEADERVALUE": "RandomHeader"}'
-        GenerateStringKey: "HEADERVALUE"
-        ExcludePunctuation: true
-
-  RotateFunctionInvokePermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      FunctionName: !Ref OriginSecretRotateFunction
-      Action: lambda:InvokeFunction
-      Principal: 'secretsmanager.amazonaws.com'
-
-  OriginVerifyRotateSchedule:
-    Type: AWS::SecretsManager::RotationSchedule
-    Properties:
-      RotationLambdaARN: !GetAtt OriginSecretRotateFunction.Arn
-      RotationRules:
-        AutomaticallyAfterDays: 7
-      SecretId: !Ref OriginVerifyHeader
-
-  # rotate header using Secrets Manager and it referrs to RotationRules
-  PythonRequestsLayer:
-    Type: AWS::Lambda::LayerVersion
-    Properties:
-      CompatibleRuntimes:
-        - python3.7
-      Content:
-        S3Bucket: !Ref SBucketName
-        S3Key: python-requests-lambda-layer.zip
-      Description: Python requests module and deps
-      LayerName: !Join ["-" , [!Ref 'AWS::StackName', python-requests]]
-
-  OriginSecretRotateFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Description: Serets Manager Rotation Lambda
-      Handler: lambda_function.lambda_handler
-      Runtime: python3.7
-      Layers:
-        - !Ref PythonRequestsLayer
-      #VpcConfig: # For accessing RDS instance
-      #  SecurityGroupIds:
-      #    - !Ref LambdaSecurityGroup
-      #  SubnetIds:
-      #    - !Ref WAprivateLambdaSubnet1
-      Environment:
-        Variables:
-          WAFACLID: !GetAtt wafACLR.Id
-          WAFACLNAME: !Select [0, !Split ['|', !Ref 'wafACLR']]
-          WAFRULEPRI: !Ref WAFRulePriority
-          CFDISTROID: !Ref CloudFrontDistribution
-          HEADERNAME: !Ref HeaderName
-          ORIGINURL: !Ref ApiGatewayURL
-          STACKNAME: !Ref AWS::StackName
-          AWSREGION: !Ref AWS::Region
-      Role: !GetAtt OriginSecretRotateExecutionRole.Arn
-      Timeout: 60
-      Code:
-        S3Bucket: !Ref SBucketName
-        S3Key: python-requests-lambda-layer.zip
-
-  OriginSecretRotateExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-        - Effect: Allow
-          Principal:
-            Service: lambda.amazonaws.com
-          Action: sts:AssumeRole
-      Policies:
-      - PolicyName: OriginVerifyRotatePolicy
-        PolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-          - Effect: Allow
-            Action:
-            - logs:CreateLogGroup
-            - logs:CreateLogStream
-            - logs:PutLogEvents
-            - logs:DescribeLogStreams
-            Resource: !Sub 'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*OriginSecretRotateFunction*'
-          - Effect: Allow
-            Action:
-            - secretsmanager:DescribeSecret
-            - secretsmanager:GetSecretValue
-            - secretsmanager:PutSecretValue
-            - secretsmanager:UpdateSecretVersionStage
-            Resource: !Ref OriginVerifyHeader
-          - Effect: Allow
-            Action:
-            - secretsmanager:GetRandomPassword
-            Resource: '*'
-          - Effect: Allow
-            Action:
-            - cloudfront:GetDistribution
-            - cloudfront:GetDistributionConfig
-            - cloudfront:ListDistributions
-            - cloudfront:UpdateDistribution
-            Resource: !Sub 'arn:aws:cloudfront::${AWS::AccountId}:distribution/${CloudFrontDistribution}'
-            #Resource: 'arn:aws:cloudfront::472961839202:distribution/EOC08E7009A8P' #test
-          - Effect: Allow
-            Action:
-            - wafv2:*
-            Resource: !GetAtt wafACLR.Arn
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole
-  #Create WAF to evaluate Origin Custom Header. This will be associated with API Gateway
-  wafACLR:
-    Type: AWS::WAFv2::WebACL
-    Properties:
-      Name: !Sub '${AWS::StackName}-ACLR'
-      Scope: REGIONAL
-      DefaultAction:
-          Block: {}
-      VisibilityConfig:
-          SampledRequestsEnabled: true
-          CloudWatchMetricsEnabled: true
-          MetricName: !Sub '${AWS::StackName}-ACLMetricR'
-      Rules:
-          - Name: !Sub '${AWS::StackName}-XRule'
-            Priority: !Ref WAFRulePriority
-            Action:
-              Allow: {}
-            VisibilityConfig:
-              SampledRequestsEnabled: true
-              CloudWatchMetricsEnabled: true
-              MetricName: !Sub '${AWS::StackName}-XMetric'
-            Statement:
-              OrStatement:
-                Statements:
-                - ByteMatchStatement:
-                    FieldToMatch:
-                      SingleHeader:
-                        Name: !Ref HeaderName
-                    PositionalConstraint: EXACTLY
-                    SearchString: !Join ['', ['{{resolve:secretsmanager:', !Ref OriginVerifyHeader, ':SecretString:HEADERVALUE}}' ]]
-                    TextTransformations:
-                      - Priority: 0
-                        Type: NONE
-                - ByteMatchStatement:
-                    FieldToMatch:
-                      SingleHeader:
-                        Name: !Ref HeaderName
-                    PositionalConstraint: EXACTLY
-                    SearchString: !Join ['', ['{{resolve:secretsmanager:', !Ref OriginVerifyHeader, ':SecretString:HEADERVALUE}}' ]]
-                    TextTransformations:
-                      - Priority: 0
-                        Type: NONE
-
-  #Have another ACL with CloudFront to prevent API Gatewy from SQL injection attacks or
-  #For AWS CloudFront, don't use 'AWS::WAFv2::WebACLAssociation'. Instead, use your CloudFront distribution configuration.
-  wafACLG:
-    Type: AWS::WAFv2::WebACL
-    Properties:
-      Name: !Sub '${AWS::StackName}-ACLG'
-      Scope: CLOUDFRONT
-      DefaultAction:
-        Allow: {}
-      VisibilityConfig:
-        SampledRequestsEnabled: true
-        CloudWatchMetricsEnabled: true
-        MetricName: !Sub '${AWS::StackName}-ACLMetricG'
-
-## Associate WAF ACL with API Gageway.
-  wafAPIGWAssociation:
-    DependsOn: wafACLR
-    Type: AWS::WAFv2::WebACLAssociation
-    Properties:
-      ResourceArn:
-          !Sub
-          - 'arn:aws:apigateway:${AWS::Region}::/restapis/${rest_api_id}/stages/${stage_name}'
-          - rest_api_id: !Select [0, !Split ['.' , !Select [2, !Split ['/', !Ref ApiGatewayURL]]]]
-            stage_name: !Select [3, !Split ['/', !Ref ApiGatewayURL]]
-      WebACLArn: !GetAtt wafACLR.Arn
-
-Outputs:
-  CognitoUserPoolID:
-    Value: !Ref WAUserPool
-    Description: User Pool ID
-  CognitoAppClientID:
-    Value: !Ref WAUserPoolClient
-    Description: App Client ID
-  CognitoSignupURL:
-    Description: Firstly, please do sign up for API Authorization
-    Value: !Join
-      - ''
-      - - https://
-        - walab-
-        - !Select [2, !Split ['/', !Ref AWS::StackId]]
-        - !Sub '.auth.${AWS::Region}.amazoncognito.com/login?client_id='
-        - !Ref WAUserPoolClient
-        - '&response_type=code&scope=aws.cognito.signin.user.admin+email+openid&redirect_uri=https://example.com/callback'
-  CloudFrontConsole:
-      Description: CloudFront console
-      Value: !Sub https://console.aws.amazon.com/cloudfront/home?region=${AWS::Region}#
-  CloudFrontEndpoint:
-      Description: Use this endpoint instead of API Gateway endpoint
-      Value: !Join ['', ['https://', !GetAtt 'CloudFrontDistribution.DomainName', '/?id=1']]
-  #OriginSecretRotateFunction:
-  #  Value: !Sub https://console.aws.amazon.com/lambda/home?region=${AWS::Region}#/functions/${OriginSecretRotateFunction}
-  #  Description: Secrets Manager Rotation Lambda Function
-  OriginVerifyHeaderName:
-    Description: Origin Header Name in CloudFront
-    Value: !Ref HeaderName
-  OriginVerifyHeader:
-    Description: Origin Header for Origin Validation
-    Value: !Sub https://console.aws.amazon.com/secretsmanager/home?region=${AWS::Region}#/secret?name=${OriginVerifyHeader}
-  WAFWebACLR:
-    Description: Regional WAF Web ACL associated with test website
-    Value: !Join ['', ['https://console.aws.amazon.com/wafv2/homev2/web-acl/', !Select [0, !Split ['|', !Ref 'wafACLR']], '/', !GetAtt 'wafACLR.Id', '/overview?region=', !Sub '${AWS::Region}']]
-  WAFWebACLG:
-    Description: Global WAF Web ACL associated with test website
-    Value: !Join ['', ['https://console.aws.amazon.com/wafv2/homev2/web-acl/', !Select [0, !Split ['|', !Ref 'wafACLG']], '/', !GetAtt 'wafACLG.Id', '/overview?region=global']]
\ No newline at end of file
diff --git a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc-flow-logs-custom.yaml b/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc-flow-logs-custom.yaml
deleted file mode 100644
index 7cfb40943..000000000
--- a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc-flow-logs-custom.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Parameters:
-  VpcId:
-    Type: String
-    Description: 'VPC ID for which flow logs will be enabled.'
-  TrafficType:
-    Description: 'The type of traffic that you wish to log.'
-    Type: String
-    Default: ALL
-    AllowedValues:
-    - ALL
-    - ACCEPT
-    - REJECT  
-  VpcFlowLogsBucketName:
-    Description: 'Optional - The name of an S3 bucket where you want flow logs to be stored. If you leave this empty, this stack will create S3 bucket for you.'
-    Type: String
-    Default: ''
-  VpcFlowLogsFilePrefix:
-    Description: (Optional) - The log file prefix in S3 bucket that comes aftter s3 bucket name
-    Type: String
-    Default: ''
-Conditions:
-  VpcLogBucketCondition: !Equals [!Ref VpcFlowLogsBucketName, '']
-  ExistingBucket: !Not [!Equals [!Ref VpcFlowLogsBucketName, '']]
-  HasLogFilePrefix: !Not [!Equals [!Ref VpcFlowLogsFilePrefix, '']]
-Resources:
-  VpcLogBucket:
-    Condition: VpcLogBucketCondition
-    Type: 'AWS::S3::Bucket'
-    Properties:
-      PublicAccessBlockConfiguration:
-            BlockPublicAcls : true
-            BlockPublicPolicy : true
-            IgnorePublicAcls : true
-            RestrictPublicBuckets : true
-      Tags:
-        -
-          Key: Name
-          Value: VPCFlowLogs-Bucket
-        -
-          Key: Purpose
-          Value: WALabVPCFlowLogs
-  VpcLogBucketPolicy:
-    Condition: VpcLogBucketCondition
-    Type: 'AWS::S3::BucketPolicy'
-    Properties:
-      Bucket: !Ref VpcLogBucket
-      PolicyDocument:
-        Version: '2012-10-17'
-        Statement:
-        - Sid: AWSLogDeliveryWrite
-          Effect: Allow
-          Principal:
-            Service: 'delivery.logs.amazonaws.com'
-          Action: 's3:PutObject'
-          Resource: !If [HasLogFilePrefix, !Sub '${VpcLogBucket.Arn}/${VpcFlowLogsFilePrefix}/AWSLogs/${AWS::AccountId}/*', !Sub '${VpcLogBucket.Arn}/AWSLogs/${AWS::AccountId}/*']
-          Condition:
-            StringEquals:
-              's3:x-amz-acl': 'bucket-owner-full-control'
-        - Sid: AWSLogDeliveryAclCheck
-          Effect: Allow
-          Principal:
-            Service: 'delivery.logs.amazonaws.com'
-          Action: 's3:GetBucketAcl'
-          Resource: !GetAtt 'VpcLogBucket.Arn'
-        - Sid: AllowSSLRequestsOnly
-          Effect: Deny
-          Principal: '*'
-          Action: 's3:*'
-          Resource:
-          - !GetAtt 'VpcLogBucket.Arn'
-          - !Sub '${VpcLogBucket.Arn}/*'
-          Condition:
-            Bool:
-              'aws:SecureTransport': false
-  VpcFlowLogNewBucket:
-    Condition: VpcLogBucketCondition
-    DependsOn: VpcLogBucketPolicy
-    Type: 'AWS::EC2::FlowLog'
-    Properties:
-      LogDestination: !If [HasLogFilePrefix, !Sub '${VpcLogBucket.Arn}/${VpcFlowLogsFilePrefix}/', !GetAtt 'VpcLogBucket.Arn']
-      LogDestinationType: s3
-      ResourceId: !Ref VpcId
-      ResourceType: 'VPC'
-      TrafficType: !Ref TrafficType      
-      LogFormat: '${version} ${account-id} ${interface-id} ${srcaddr} ${dstaddr} ${srcport} ${dstport} ${protocol} ${packets} ${bytes} ${start} ${end} ${action} ${log-status} ${vpc-id} ${az-id} ${instance-id} ${pkt-srcaddr} ${pkt-dstaddr} ${region} ${subnet-id} ${sublocation-id} ${sublocation-type} ${tcp-flags} ${type} ${flow-direction} ${pkt-dst-aws-service} ${pkt-src-aws-service} ${traffic-path}'
-      MaxAggregationInterval: 600 # You can specify 60 seconds (1 minute) or 600 seconds (10 minutes).
-      Tags:
-        -
-          Key: Name
-          Value: VPCFlowLogs-CFN
-        -
-          Key: Purpose
-          Value: WALabVPCFlowLogs
-  VpcFlowLogExistingBucket:
-    Condition: ExistingBucket
-    Type: 'AWS::EC2::FlowLog'
-    Properties:
-      LogDestination: !If [HasLogFilePrefix, !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}/${VpcFlowLogsFilePrefix}/', !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}']
-      LogDestinationType: s3
-      ResourceId: !Ref VpcId
-      ResourceType: 'VPC'
-      TrafficType: !Ref TrafficType      
-      LogFormat: '${version} ${account-id} ${interface-id} ${srcaddr} ${dstaddr} ${srcport} ${dstport} ${protocol} ${packets} ${bytes} ${start} ${end} ${action} ${log-status} ${vpc-id} ${az-id} ${instance-id} ${pkt-srcaddr} ${pkt-dstaddr} ${region} ${subnet-id} ${sublocation-id} ${sublocation-type} ${tcp-flags} ${type} ${flow-direction} ${pkt-dst-aws-service} ${pkt-src-aws-service} ${traffic-path}'
-      MaxAggregationInterval: 600 # You can specify 60 seconds (1 minute) or 600 seconds (10 minutes).
-      Tags:
-        -
-          Key: Name
-          Value: VPCFlowLogs-CFN
-        -
-          Key: Purpose
-          Value: WALabVPCFlowLogs
-Outputs:
-  StackName:
-    Description: 'Stack name.'
-    Value: !Sub '${AWS::StackName}'
-  LogBucketName:
-    Description: 'VPC Flow Logs bucket name.'
-    Value: !If [VpcLogBucketCondition, !Ref VpcLogBucket, !Ref VpcFlowLogsBucketName]
\ No newline at end of file
diff --git a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda.yaml b/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda.yaml
deleted file mode 100644
index 478d2dce5..000000000
--- a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda.yaml
+++ /dev/null
@@ -1,567 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Template creates Athena Database and View for VPC Flow Logs'
-Parameters:
-  AthenaQueryResultBucketArn:
-    Type: String
-    Description: The ARN of the Amazon S3 bucket to which Athena query results are stored. e.g. 'arn:aws:s3:::aws-athena-query-results-us-east-1-XXXXXXXXXXXXXX'
-    Default: ''
-  AthenaResultsOutputLocation:
-    Type: String
-    Description: URI path of the Amazon S3 bucket where Athena query results are stored.
-  VpcFlowLogsBucketName:
-    Type: String
-    Description: Name of the Amazon S3 bucket where vpc flow logs are stored. e.g. my-flow-logs
-    Default: ''
-  VpcFlowLogsS3BucketLocation:
-    Type: String
-    Description: URI path of Amazon S3 bucket folder where VPC Flow logs files are stored e.g. Location='s3://my-vpc-flow-logs-bucket/vpc-flow-logs-enh-parquet/AWSLogs/0123456789/vpcflowlogs/eu-central-1/2021/11/01/'
-  VpcFlowLogsFilePrefix:
-    Description: (Optional) - The log file prefix in Amazon S3 bucket that comes right after s3 bucket name e.g. 'vpc-flow-logs'
-    Type: String
-    Default: ''
-  VpcFlowLogsAthenaDatabaseName:
-    Type: String
-    Description: (Optional) If you leave this blank this template will create an Athena database where external table for VPC flow logs is created. If you have already created a DB then external table will be created under existing DB.
-  VpcFlowLogsAthenaTableName:
-    Type: String
-    Description: (Optional) If you leave this blank this template will create new Athena external table name for VPC flow logs otherwise it will use the existing table name you provided.
-  HiveCompatibleS3prefix:
-    Type: String
-    Description: Adds prefixes of partition keys in s3 object key (Hive-compatible S3 prefix)
-    AllowedValues:
-      - true
-      - false
-    Default: false
-  S3BucketRegion:
-    Type: String
-    Description: Region of the S3 bucket created in the central account. e.g. us-east-1
-  
-Conditions:
-  VpcLogsAthenaDataBaseCondition: !Equals [!Ref VpcFlowLogsAthenaDatabaseName, '']
-  ExistingVpcLogsAthenaDataBaseCondition: !Not [!Equals [!Ref VpcFlowLogsAthenaDatabaseName, '']]
-  VpcLogsAthenaTableCondition: !Equals [!Ref VpcFlowLogsAthenaTableName, '']
-  ExistingVpcLogsAthenaTableCondition: !Not [!Equals [!Ref VpcFlowLogsAthenaTableName, '']]
-Resources:
-  # Creates a glue database for VPC Flow logs
-  VpcFlowLogsAthenaDatabase:
-    Condition: VpcLogsAthenaDataBaseCondition
-    Type: AWS::Glue::Database
-    Properties:
-      DatabaseInput:
-        Name: 'vpcflowlogsathenadatabase'
-      CatalogId: !Ref AWS::AccountId
-  # Create Athena external Table for VPC Flow Logs
-  VpcFlowLogsAthenaTable:
-    Condition: VpcLogsAthenaTableCondition
-    Type: AWS::Glue::Table
-    Properties:
-      CatalogId: !Ref AWS::AccountId
-      DatabaseName: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-      TableInput:
-        Description: This table has the schema for vpc flow logs information.
-        Name: vpc_flow_logs_custom_integration
-        PartitionKeys:
-          - Name: aws-account-id
-            Type: string
-          - Name: aws-service
-            Type: string
-          - Name: aws-region
-            Type: string
-          - Name: year
-            Type: string
-          - Name: month
-            Type: string
-          - Name: day
-            Type: string
-        TableType: EXTERNAL_TABLE
-        StorageDescriptor:
-          Location:  !Ref VpcFlowLogsS3BucketLocation
-          InputFormat: org.apache.hadoop.mapred.TextInputFormat
-          OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-          SerdeInfo:
-            Parameters:
-              skip.header.line.count: "1"
-              EXTERNAL: "true"
-              field.delim: ' '
-              serialization.format: ' '
-            SerializationLibrary: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-          Columns:
-            - Name: 'version'
-              Type: int
-            - Name: 'account_id'
-              Type: string
-            - Name: 'interface_id'
-              Type: string
-            - Name: 'srcaddr'
-              Type: string
-            - Name: 'dstaddr'
-              Type: string
-            - Name: 'srcport'
-              Type: int
-            - Name: 'dstport'
-              Type: int
-            - Name: 'protocol'
-              Type: bigint
-            - Name: 'packets'
-              Type: bigint
-            - Name: 'bytes'
-              Type: bigint
-            - Name: 'start'
-              Type: bigint
-            - Name: 'end'
-              Type: bigint
-            - Name: 'action'
-              Type: string
-            - Name: 'log_status'
-              Type: string
-            - Name: 'vpc_id'
-              Type: string
-            - Name: 'az_id'
-              Type: string
-            - Name: 'instance_id'
-              Type: string
-            - Name: 'pkt_srcaddr'
-              Type: string
-            - Name: 'pkt_dstaddr'
-              Type: string
-            - Name: 'region'
-              Type: string
-            - Name: 'subnet_id'
-              Type: string
-            - Name: 'sublocation_id'
-              Type: string
-            - Name: 'sublocation_type'
-              Type: string
-            - Name: 'tcp_flags'
-              Type: int
-            - Name: 'type'
-              Type: string
-            - Name: 'flow_direction'
-              Type: string
-            - Name: 'pkt_dst_aws_service'
-              Type: string
-            - Name: 'pkt_src_aws_service'
-              Type: string
-            - Name: 'traffic_path'
-              Type: int
-  # Creates an IAM role for lambda function execution permission
-  VPCFlowLogsAthenaIntegrationLambdaExecutorRole:
-      Type: AWS::IAM::Role
-      Properties:
-        AssumeRolePolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-            - Effect: Allow
-              Principal:
-                Service: lambda.amazonaws.com
-              Action: sts:AssumeRole
-        ManagedPolicyArns:
-          - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        Path: /
-        Policies:
-          - PolicyName: VPCFlowLogsAthenaIntegrationLambdaExecutorPolicy
-            PolicyDocument:
-              Version: '2012-10-17'
-              Statement:
-                - Effect: Allow
-                  Action:
-                    - s3:ListBucket
-                    - logs:CreateLogGroup
-                  Resource:
-                    - !Sub '${AthenaQueryResultBucketArn}'
-                    - !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}'
-                    - !Sub 'arn:aws:logs:${S3BucketRegion}:${AWS::AccountId}:*'
-                - Effect: Allow
-                  Action:
-                    - s3:PutObject
-                    - s3:GetBucketLocation
-                    - s3:GetObject
-                    - logs:CreateLogStream
-                    - logs:PutLogEvents
-                  Resource:
-                    - !Sub '${AthenaQueryResultBucketArn}'
-                    - !Sub '${AthenaQueryResultBucketArn}/*'
-                    - !Sub 'arn:aws:logs:${S3BucketRegion}:${AWS::AccountId}:log-group:/aws/lambda/vpc_logs_lambda_handler:*'
-                - Effect: Allow
-                  Action:
-                    - athena:GetQueryResults
-                    - athena:StartQueryExecution
-                    - athena:CreateNamedQuery
-                    - athena:GetQueryExecution
-                  Resource:
-                    - !Sub 'arn:aws:athena:*:${AWS::AccountId}:workgroup/primary'
-                - Effect: Allow
-                  Action:
-                    - glue:GetDatabase
-                    - glue:GetTable
-                    - glue:CreateTable
-                    - glue:UpdateTable
-                    - glue:BatchCreatePartition
-                    - glue:CreatePartition
-                    - glue:UpdatePartition
-                    - glue:GetPartition
-                  Resource:
-                    - !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:catalog'
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:database/${VpcFlowLogsAthenaDatabaseName}', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:database/${VpcFlowLogsAthenaDatabase}']
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabaseName}/${VpcFlowLogsAthenaTableName}', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabase}/${VpcFlowLogsAthenaTable}']
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabaseName}/vpc_flow_logs_view', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabase}/vpc_flow_logs_view']
-                - Effect: Allow
-                  Action:
-                    - s3:GetObjectAcl
-                    - s3:GetObject
-                    - s3:GetObjectTagging
-                    - s3:GetBucketPolicy
-                  Resource:
-                    - !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}'
-                    - !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}/*'
-        Tags:
-          -
-            Key: Name
-            Value: VPCFlowLogs-Lambda-Role
-          -
-            Key: Purpose
-            Value: WALabVPCFlowLogs
-    # Create Athena view for VPC Flow Logs
-  # Creates a lambda fuction to add partitions to VPC Flow Logs external table
-  VPCAthenaPartitionsFunction:
-      Type: AWS::Lambda::Function
-      Properties:
-        Description: Adds partitions to Athena table for current day. Triggered by Cloudwatch scheduler with daily frequency.
-        Handler: index.lambda_handler
-        Runtime: python3.8
-        Role: !GetAtt 'VPCFlowLogsAthenaIntegrationLambdaExecutorRole.Arn'
-        Timeout: 30
-        Code:
-          ZipFile: |
-
-            import boto3
-            import datetime
-            import time
-            import re
-            import cfnresponse
-
-            #S3 and Athena client
-            s3 = boto3.client('s3')
-            athena = boto3.client('athena')
-
-            #Get Year, Month, Day for partition
-            date = datetime.datetime.now()
-            athena_year = str(date.year)
-            athena_month = str(date.month).rjust(2, '0')
-            athena_day = str(date.day).rjust(2, '0')
-
-            s3_buckcet_flow_log = '' # '<s3 bucket name where flow logs will be stored>'
-            s3_account_prefix = 'vpc-flow-logs/AWSLogs/' # '<prefix for VPC flow logs that comes after bucket name>' e.g. 'vpc-flow-logs'
-            s3_ouput = '<S3 bucket URL where Athena query results are stored>'
-            # e.g. 's3://aws-athena-query-results-us-east-1-<account number>'
-            database = ''
-            table_name = '' # '<Athena table name for VPC flow logs>'
-
-            #Executing the athena query:
-            def run_query(query, database, s3_output):
-              try:
-                query_response = athena.start_query_execution(
-                QueryString=query,
-                QueryExecutionContext={
-                    'Database': database
-                    },
-                ResultConfiguration={
-                    'OutputLocation': s3_output,
-                    }
-                )
-                
-                execution_id=query_response['QueryExecutionId']
-                state = 'RUNNING'
-                while (state in ['RUNNING', 'QUEUED']):
-                    response = athena.get_query_execution(QueryExecutionId=execution_id)
-                    if 'QueryExecution' in response and 'Status' in response['QueryExecution'] and 'State' in \
-                            response['QueryExecution']['Status']:
-                        state = response['QueryExecution']['Status']['State']
-                        if state == 'FAILED':
-                            print(response)
-                            print("state == FAILED")
-                            print('Execution ID: ' + query_response['QueryExecutionId'])
-                            return False
-                        elif state == 'SUCCEEDED':
-                            s3_path = response['QueryExecution']['ResultConfiguration']['OutputLocation']
-                            filename = re.findall('.*\/(.*)', s3_path)[0]
-                            return response
-                    time.sleep(1)
-              except Exception as e:
-                print("Query Exception:- ", e)
-
-              return query_response
-
-            #Function to get the regions and run the query on the captured regions
-            def lambda_handler(event, context):
-              errs = {}
-              status = cfnresponse.SUCCESS
-              account_id=None
-              region=None
-
-              database = event["ResourceProperties"]["dbName"] if event.get("ResourceProperties") != None else event["dbName"]
-              table_name = event["ResourceProperties"]["VPCTableName"] if event.get("ResourceProperties") != None else event["VPCTableName"]
-              frequency = event["ResourceProperties"]["frequency"] if event.get("ResourceProperties") != None else event["frequency"]
-              s3_buckcet_flow_log = event["ResourceProperties"]["VpcFlowLogsBucketName"] if event.get("ResourceProperties") != None else event["VpcFlowLogsBucketName"]
-              s3_ouput = event["ResourceProperties"]["s3Output"] if event.get("ResourceProperties") != None else event["s3Output"]
-              s3_account_prefix=event["ResourceProperties"]["VpcFlowLogsFilePrefix"] + "AWSLogs/" if event.get("ResourceProperties") != None else event["VpcFlowLogsFilePrefix"] + "/AWSLogs/"
-              hive_compatible_s3_prefix = event["ResourceProperties"]["HiveCompatibleS3prefix"] if event.get("ResourceProperties") != None else event["HiveCompatibleS3prefix"]
-              account_result = s3.list_objects(Bucket=s3_buckcet_flow_log,Prefix=s3_account_prefix, Delimiter='/')
-
-              if event.get("RequestType") == 'Delete':
-                status = cfnresponse.SUCCESS
-                cfnresponse.send(event, context, status, {}, event["LogicalResourceId"])
-              else:
-                try:
-                  for accounts in account_result.get('CommonPrefixes'):
-                    get_account=(accounts.get('Prefix','').replace(s3_account_prefix,'').replace('/',''))
-                    if get_account.find("=") >0: 
-                      account_id=get_account.split("=")[1] 
-                    else: 
-                      account_id=get_account
-
-                    if hive_compatible_s3_prefix == 'true':
-                      s3_prefix = s3_account_prefix + get_account + '/aws-service=vpcflowlogs/'
-                    else:
-                      s3_prefix = s3_account_prefix + get_account + '/vpcflowlogs/'
-
-                    s3_input = 's3://' + s3_buckcet_flow_log + '/' + s3_prefix
-                    
-                    result =  s3.list_objects(Bucket=s3_buckcet_flow_log,Prefix=s3_prefix, Delimiter='/')                    
-                    for regions in result.get('CommonPrefixes'):
-                      get_region=(regions.get('Prefix','').replace(s3_prefix,'').replace('/',''))
-                      if get_region.find("=") >0: 
-                        region=get_region.split("=")[1] 
-                      else: 
-                        region=get_region
-
-                      if hive_compatible_s3_prefix == 'true':
-                        query = str("ALTER TABLE "+ database + "." + table_name +" ADD PARTITION (`aws-account-id`=\""
-                                + account_id + "\", `aws-service`=\"vpcflowlogs\", `aws-region`=\""
-                                + region + "\", year=\""
-                                + athena_year + "\", month=\""
-                                + athena_month + "\", day=\""
-                                + athena_day + "\"")
-                      else:
-                        query = str("ALTER TABLE "+ database + "." + table_name +" ADD PARTITION (`aws-account-id`=\""
-                              + account_id + "\", `aws-service`=\"vpcflowlogs\", `aws-region`=\""
-                              + region + "\", year=\""
-                              + athena_year + "\", month=\""
-                              + athena_month + "\", day=\""
-                              + athena_day + "\"")
-
-                      if hive_compatible_s3_prefix == 'true':
-                        if frequency == "Hourly":
-                            query += ", hour=\"00\")"
-                        else:
-                            query += ")"
-                        query += " location '" + s3_input + get_region + "/year=" + athena_year + "/month=" + athena_month + "/day=" + athena_day
-                        if frequency == "Hourly":
-                            query += "/hour=00';"
-                        else:
-                            query += "';"
-                      else:
-                        if frequency == "Hourly":
-                            query += ", \"00\")"
-                        else:
-                            query += ")"
-                        query += " location '" + s3_input + get_region + "/" + athena_year + "/" + athena_month + "/" + athena_day
-                        if frequency == "Hourly":
-                            query += "/00';"
-                        else:
-                            query += "';"
-                      ## Enable below prints for debugging ##
-                      # print("*" * 10, "START",  "*" * 10) # -- for debug
-                      # print(region) # -- for debug
-                      # print(query) # -- for debug
-                      # print("*" * 10, "START",  "*" * 10) # -- for debug
-                      # print(database) # -- for debug
-                      # print(s3_ouput) # -- for debug
-
-                      query_result=run_query(query, database, s3_ouput)
-
-                      # print(query_result) # -- for debug
-                      # print("*" * 10, "END",  "*" * 10) # -- for debug
-
-                    status = cfnresponse.SUCCESS
-                except Exception as e:
-                  errs = e
-                  status = cfnresponse.FAILED
-                finally:
-                  status = cfnresponse.SUCCESS
-                  if event.get("RequestType") != None: cfnresponse.send(event, context, status, {}, event.get("LogicalResourceId"))                  
-        Tags:
-          -
-            Key: Name
-            Value: VPCFlowLogs-Lambda-Function
-          -
-            Key: Purpose
-            Value: WALabVPCFlowLogs
-  # Cloudwatch event rule that will be triggered daily for adding partitions to vpc flow logs Athena table            
-  DailyAddPartitionLambdaEventsRule:
-    Type: AWS::Events::Rule
-    Properties: 
-      Description: Event rule to trigger lambda function that adds partition to athena table for vpc flow logs.
-      Name: daily-add-vpc-logs-partitions
-      ScheduleExpression: "rate(1 day)"
-      State: ENABLED
-      Targets: 
-        - Arn: !Sub ${VPCAthenaPartitionsFunction.Arn}
-          Id: DailyAddPartitionLambdaEventsRule
-          Input: !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub  '{"frequency": "Daily", "dbName": "${VpcFlowLogsAthenaDatabaseName}", "VPCTableName": "${VpcFlowLogsAthenaTableName}", "s3Output": "${AthenaResultsOutputLocation}", "VpcFlowLogsBucketName": "${VpcFlowLogsBucketName}", "VpcFlowLogsFilePrefix": "${VpcFlowLogsFilePrefix}", "HiveCompatibleS3prefix": "${HiveCompatibleS3prefix}"}', !Sub  '{"frequency": "Daily", "dbName": "${VpcFlowLogsAthenaDatabase}", "VPCTableName": "${VpcFlowLogsAthenaTable}", "s3Output": "${AthenaResultsOutputLocation}", "VpcFlowLogsBucketName": "${VpcFlowLogsBucketName}", "VpcFlowLogsFilePrefix": "${VpcFlowLogsFilePrefix}", "HiveCompatibleS3prefix": "${HiveCompatibleS3prefix}"}']   
-  # Creates permission for cloudwatch events to execute lambda function
-  PermissionForEventsToInvokeLambda: 
-    Type: AWS::Lambda::Permission
-    Properties: 
-      FunctionName: !Sub ${VPCAthenaPartitionsFunction.Arn}
-      Action: "lambda:InvokeFunction"
-      Principal: "events.amazonaws.com"
-      SourceArn: 
-        Fn::GetAtt: 
-          - "DailyAddPartitionLambdaEventsRule"
-          - "Arn"
-  # Creates an initializer trigger Athena partition lambda function invokation 
-  CreatePartitionInitializer:
-    Type: 'Custom::VPCFlowLogsAthenaPartitionInitializer'
-    DependsOn:
-      - VPCAthenaPartitionsFunction
-    Properties:
-      ServiceToken: !GetAtt VPCAthenaPartitionsFunction.Arn
-      dbName: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-      VPCTableName: !If [ExistingVpcLogsAthenaTableCondition, !Ref VpcFlowLogsAthenaTableName, !Ref VpcFlowLogsAthenaTable]
-      service: vpcflowlogs
-      frequency: "Daily"
-      s3Output: !Ref AthenaResultsOutputLocation
-      VpcFlowLogsBucketName: !Ref VpcFlowLogsBucketName
-      VpcFlowLogsFilePrefix: !Ref VpcFlowLogsFilePrefix
-      HiveCompatibleS3prefix: !Ref HiveCompatibleS3prefix
-  # Creates Athena View for VPC Flow Logs
-  VPCAthenaViewFunction:
-      Type: AWS::Lambda::Function
-      Properties:
-        Description: Creates Athena view for VPC FLow Logs external table
-        Handler: index.lambda_handler
-        Runtime: python3.8
-        Role: !GetAtt 'VPCFlowLogsAthenaIntegrationLambdaExecutorRole.Arn'
-        Timeout: 60
-        Code:
-          ZipFile: |
-
-            import boto3
-            import datetime
-            import time
-            import re
-            import cfnresponse
-
-            # S3 and Athena client
-            s3 = boto3.client('s3')
-            athena = boto3.client('athena')
-
-            #Executing the athena query:
-            def run_query(query, database, s3_output):
-              try:
-                query_response = athena.start_query_execution(
-                QueryString=query,
-                QueryExecutionContext={
-                    'Database': database
-                    },
-                ResultConfiguration={
-                    'OutputLocation': s3_output,
-                    }
-                )
-                
-                execution_id=query_response['QueryExecutionId']
-                state = 'RUNNING'
-                while (state in ['RUNNING', 'QUEUED']):
-                    response = athena.get_query_execution(QueryExecutionId=execution_id)
-                    if 'QueryExecution' in response and 'Status' in response['QueryExecution'] and 'State' in \
-                            response['QueryExecution']['Status']:
-                        state = response['QueryExecution']['Status']['State']
-                        if state == 'FAILED':
-                            print(response)
-                            print("state == FAILED")
-                            print('Execution ID: ' + query_response['QueryExecutionId'])
-                            return False
-                        elif state == 'SUCCEEDED':
-                            s3_path = response['QueryExecution']['ResultConfiguration']['OutputLocation']
-                            filename = re.findall('.*\/(.*)', s3_path)[0]
-                            return filename
-                    time.sleep(1)
-              except Exception as e:
-                print("Query Exception:- ", e)
-
-              return query_response
-
-            #Function to get the regions and run the query on the captured regions
-            def lambda_handler(event, context):
-                errs = None
-                status = cfnresponse.SUCCESS
-                database = event["ResourceProperties"]["athenaIntegrations"][0]["database"]
-                s3_output = event["ResourceProperties"]["athenaIntegrations"][0]["s3_output"]
-                vpc_table_name = event["ResourceProperties"]["athenaIntegrations"][0]["vpc_table_name"]
-                if event["RequestType"] == 'Delete':
-                  status = cfnresponse.SUCCESS
-                  cfnresponse.send(event, context, status, errs, event["LogicalResourceId"])
-                else:
-                  try:
-                    query = str("CREATE OR REPLACE VIEW vpc_flow_logs_view AS "
-                          + " SELECT  \"version\" \"version\", \"account_id\" \"accountid\", \"interface_id\" \"interfaceid\", \"srcaddr\" \"sourceaddress\""
-                          + ", \"dstaddr\" \"destinationaddress\", \"srcport\" \"sourceport\", \"dstport\" \"destinationport\", \"protocol\" \"protocol\""
-                          + ", \"packets\" \"numpackets\", \"bytes\" \"numbytes\", \"start\" \"starttime\", \"end\" \"endtime\", \"action\" \"action\", \"log_status\" \"logstatus\""
-                          + ", \"vpc_id\" \"vpcid\", \"az_id\" \"azid\", \"instance_id\" \"instanceid\", \"pkt_srcaddr\" \"packetsourceaddr\", \"pkt_dstaddr\" \"packetdestinationaddr\""
-                          + ", \"region\" \"region\", \"subnet_id\" \"subnetid\", \"sublocation_id\" \"sublocationid\", \"sublocation_type\" \"sublocationtype\""
-                          + ", (CASE WHEN (cast(\"tcp_flags\" as varchar) = '1') THEN 'FIN' WHEN (cast(\"tcp_flags\" as varchar) = '2') THEN 'SYN' WHEN (cast(\"tcp_flags\" as varchar) = '3') THEN 'SYN-FIN' WHEN (cast(\"tcp_flags\" as varchar) = '4') THEN 'RST' "
-                          + " WHEN (cast(\"tcp_flags\" as varchar) = '8') THEN 'PSH' WHEN (cast(\"tcp_flags\" as varchar) = '16') THEN 'ACK' WHEN (cast(\"tcp_flags\" as varchar) = '18') THEN 'SYN-ACK' WHEN (cast(\"tcp_flags\" as varchar) = '19') THEN 'SYN-ACK-FIN' "
-                          + " WHEN (cast(\"tcp_flags\" as varchar) = '32') THEN 'URG' ELSE cast(\"tcp_flags\" as varchar) END) \"tcpflags\", \"tcp_flags\" \"tcp_flags\""
-                          + ", \"flow_direction\" \"flowdirection\", \"pkt_src_aws_service\" \"packetsrcawsservice\", \"pkt_dst_aws_service\" \"packetdstawsservice\""
-                          + ", (CASE WHEN (cast(\"traffic_path\" as varchar) = '1') THEN 'ResourceInSameVPC' WHEN (cast(\"traffic_path\" as varchar) = '2') THEN 'IGW-OR-GatewayVPCEndpoint' WHEN (cast(\"traffic_path\" as varchar) = '3') THEN 'VirtualPrivateGateway' "
-                          + " WHEN (cast(\"traffic_path\" as varchar) = '4') THEN 'Intra-RegionVPCPeering' WHEN (cast(\"traffic_path\" as varchar) = '5') THEN 'Inter-RegionVPCPeering' WHEN (cast(\"traffic_path\" as varchar) = '6') THEN 'LocalGateway' "
-                          + " WHEN (cast(\"traffic_path\" as varchar) = '7') THEN 'GatewayVPCEndpoint' WHEN (cast(\"traffic_path\" as varchar) = '8') THEN 'InternetGateway' ELSE cast(\"traffic_path\" as varchar) END) \"trafficpath\", \"traffic_path\" \"traffic_path\", \"type\" \"iptype\""
-                          + ", cast(\"date_format\"(\"from_unixtime\"(\"start\"), '%d') as integer) \"startday\""
-                          + ", cast(\"date_format\"(\"from_unixtime\"(\"start\"), '%m') as integer) \"startmonth\""
-                          + ", cast(\"date_format\"(\"from_unixtime\"(\"end\"), '%d') as integer) \"endday\""
-                          + ", cast(\"date_format\"(\"from_unixtime\"(\"end\"), '%m') as integer) \"endmonth\""
-                          + " FROM " + vpc_table_name + " WHERE (year=format_datetime(current_timestamp,'YYYY') and month=format_datetime(current_timestamp,'MM'))"
-                          + " OR (year=format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '3' MONTH),'YYYY') AND month=format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '3' MONTH),'MM'))"
-                          + " OR (year=format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '2' MONTH),'YYYY') AND month=format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '2' MONTH),'MM'))"
-                          + " OR (year=format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH),'YYYY') AND month=format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH),'MM'));")
-                        ## Enable below prints for debugging ##
-                        # print("*" * 10, "START",  "*" * 10) # -- for debug
-                        # print(get_region) # -- for debug
-                        # print(query) # -- for debug
-                        #print(database) # -- for debug
-                        #print(s3_output) # -- for debug
-                    query_result=run_query(query, database, s3_output)
-                    # print(query_result) # -- for debug
-                    # print("*" * 10, "END",  "*" * 10) # -- for debug
-                    status = cfnresponse.SUCCESS
-                  except Exception as e:
-                    print("Query Exception:- ", e)
-                    errs = e
-                    status = cfnresponse.FAILED
-                  finally:
-                    cfnresponse.send(event, context, status, errs, event["LogicalResourceId"])
-        Tags:
-          -
-            Key: Name
-            Value: VPCFlowLogs-Lambda-Function
-          -
-            Key: Purpose
-            Value: WALabVPCFlowLogs
-  # Creates an initializer trigger to Athena View lambda function invokation 
-  CreateAthenaViewInitializer:
-    Type: 'Custom::VPCFlowLogsAthenaViewStartInitializer'
-    DependsOn:
-      - VPCAthenaViewFunction
-    Properties:
-      ServiceToken: !GetAtt VPCAthenaViewFunction.Arn
-      dbName: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-      service: vpcflowlogs
-      athenaIntegrations:
-        - s3_output: !Ref AthenaResultsOutputLocation
-          database: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-          vpc_table_name: !If [ExistingVpcLogsAthenaTableCondition, !Ref VpcFlowLogsAthenaTableName, !Ref VpcFlowLogsAthenaTable]
-Outputs:
-  StackName:
-    Description: 'Stack name'
-    Value: !Sub '${AWS::StackName}'
diff --git a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda_parquet.yaml b/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda_parquet.yaml
deleted file mode 100644
index 347fab9fc..000000000
--- a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_athena_db_table_view_lambda_parquet.yaml
+++ /dev/null
@@ -1,619 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Template creates Athena Database and View for VPC Flow Logs'
-Parameters:
-  AthenaQueryResultBucketArn:
-    Type: String
-    Description: The ARN of the Amazon S3 bucket to which Athena query results are stored. e.g. 'arn:aws:s3:::aws-athena-query-results-us-east-1-XXXXXXXXXXXXXX'
-    Default: ''
-  AthenaResultsOutputLocation:
-    Type: String
-    Description: URI path of the Amazon S3 bucket where Athena query results are stored.
-  VpcFlowLogsBucketName:
-    Type: String
-    Description: Name of the Amazon S3 bucket where vpc flow logs are stored. e.g. my-flow-logs
-    Default: ''
-  VpcFlowLogsS3BucketLocation:
-    Type: String
-    Description: URI path of Amazon S3 bucket folder where VPC Flow logs files are stored e.g. Location='s3://my-vpc-flow-logs-bucket/vpc-flow-logs-enh-parquet/AWSLogs/'
-  VpcFlowLogsFilePrefix:
-    Description: (Optional) - The log file prefix in Amazon S3 bucket that comes right after s3 bucket name e.g. 'vpc-flow-logs-enh-parquet'
-    Type: String
-    Default: ''
-  VpcFlowLogsAthenaDatabaseName:
-    Type: String
-    Description: (Optional) If you leave this blank this template will create an Athena database where external table for VPC flow logs is created. If you have already created a DB then external table will be created under existing DB.
-  VpcFlowLogsAthenaTableName:
-    Type: String
-    Description: (Optional) If you leave this blank this template will create new Athena external table name for VPC flow logs otherwise it will use the existing table name you provided.
-  HiveCompatibleS3prefix:
-    Type: String
-    Description: Adds prefixes of partition keys in s3 object key (Hive-compatible S3 prefix)
-    AllowedValues:
-      - true
-    Default: true
-  S3BucketRegion:
-    Type: String
-    Description: Region of the S3 bucket created in the central account. e.g. us-east-1
-Conditions:
-  VpcLogsAthenaDataBaseCondition: !Equals [!Ref VpcFlowLogsAthenaDatabaseName, '']
-  ExistingVpcLogsAthenaDataBaseCondition: !Not [!Equals [!Ref VpcFlowLogsAthenaDatabaseName, '']]
-  VpcLogsAthenaTableCondition: !Equals [!Ref VpcFlowLogsAthenaTableName, '']
-  ExistingVpcLogsAthenaTableCondition: !Not [!Equals [!Ref VpcFlowLogsAthenaTableName, '']]
-Resources:
-  # Creates a glue database for VPC Flow logs
-  VpcFlowLogsAthenaDatabase:
-    Condition: VpcLogsAthenaDataBaseCondition
-    Type: AWS::Glue::Database
-    Properties:
-      DatabaseInput:
-        Name: 'vpcflowlogsathenadatabase'
-      CatalogId: !Ref AWS::AccountId
-  # Create Athena external Table for VPC Flow Logs
-  VpcFlowLogsAthenaTable:
-    Condition: VpcLogsAthenaTableCondition
-    Type: AWS::Glue::Table
-    Properties:
-      CatalogId: !Ref AWS::AccountId
-      DatabaseName: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-      TableInput:
-        Description: This table has the schema for vpc flow logs information.
-        Name: vpc_flow_logs_custom_integration
-        PartitionKeys:
-          - Name: aws-account-id
-            Type: string
-          - Name: aws-service
-            Type: string
-          - Name: aws-region
-            Type: string
-          - Name: year
-            Type: string
-          - Name: month
-            Type: string
-          - Name: day
-            Type: string
-        TableType: EXTERNAL_TABLE
-        StorageDescriptor:
-          Location:  !Ref VpcFlowLogsS3BucketLocation
-          InputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat
-          OutputFormat: org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat
-          SerdeInfo:
-            Parameters:
-              skip.header.line.count: "1"
-              EXTERNAL: "true"
-              field.delim: ' '
-              serialization.format: ' '
-            SerializationLibrary: org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe
-          Columns:
-            - Name: 'account_id'
-              Type: string
-            - Name: 'action'
-              Type: string
-            - Name: 'az_id'
-              Type: string
-            - Name: 'bytes'
-              Type: bigint
-            - Name: 'dstaddr'
-              Type: string
-            - Name: 'dstport'
-              Type: int
-            - Name: 'end'
-              Type: bigint
-            - Name: 'flow_direction'
-              Type: string
-            - Name: 'instance_id'
-              Type: string
-            - Name: 'interface_id'
-              Type: string
-            - Name: 'log_status'
-              Type: string
-            - Name: 'packets'
-              Type: bigint
-            - Name: 'pkt_dst_aws_service'
-              Type: string
-            - Name: 'pkt_dstaddr'
-              Type: string
-            - Name: 'pkt_src_aws_service'
-              Type: string
-            - Name: 'pkt_srcaddr'
-              Type: string
-            - Name: 'protocol'
-              Type: bigint
-            - Name: 'region'
-              Type: string
-            - Name: 'srcaddr'
-              Type: string
-            - Name: 'srcport'
-              Type: int
-            - Name: 'start'
-              Type: bigint
-            - Name: 'sublocation_id'
-              Type: string
-            - Name: 'sublocation_type'
-              Type: string
-            - Name: 'subnet_id'
-              Type: string
-            - Name: 'tcp_flags'
-              Type: int
-            - Name: 'traffic_path'
-              Type: int
-            - Name: 'type'
-              Type: string
-            - Name: 'version'
-              Type: int
-            - Name: 'vpc_id'
-              Type: string
-  # Creates an IAM role for lambda function execution permission
-  VPCFlowLogsAthenaIntegrationLambdaExecutorRole:
-      Type: AWS::IAM::Role
-      Properties:
-        AssumeRolePolicyDocument:
-          Version: '2012-10-17'
-          Statement:
-            - Effect: Allow
-              Principal:
-                Service: lambda.amazonaws.com
-              Action: sts:AssumeRole
-        ManagedPolicyArns:
-          - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        Path: /
-        Policies:
-          - PolicyName: VPCFlowLogsAthenaIntegrationLambdaExecutorPolicy
-            PolicyDocument:
-              Version: '2012-10-17'
-              Statement:
-                - Effect: Allow
-                  Action:
-                    - s3:ListBucket
-                    - logs:CreateLogGroup
-                  Resource:
-                    - !Sub '${AthenaQueryResultBucketArn}'
-                    - !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}'
-                    - !Sub 'arn:aws:logs:${S3BucketRegion}:${AWS::AccountId}:*'
-                - Effect: Allow
-                  Action:
-                    - s3:PutObject
-                    - s3:GetBucketLocation
-                    - s3:GetObject
-                    - logs:CreateLogStream
-                    - logs:PutLogEvents
-                  Resource:
-                    - !Sub '${AthenaQueryResultBucketArn}'
-                    - !Sub '${AthenaQueryResultBucketArn}/*'
-                    - !Sub 'arn:aws:logs:${S3BucketRegion}:${AWS::AccountId}:log-group:/aws/lambda/vpc_logs_lambda_handler:*'
-                - Effect: Allow
-                  Action:
-                    - athena:GetQueryResults
-                    - athena:StartQueryExecution
-                    - athena:CreateNamedQuery
-                    - athena:GetQueryExecution
-                  Resource:
-                    - !Sub 'arn:aws:athena:*:${AWS::AccountId}:workgroup/primary'
-                - Effect: Allow
-                  Action:
-                    - glue:GetDatabase
-                    - glue:GetTable
-                    - glue:CreateTable
-                    - glue:UpdateTable
-                    - glue:BatchCreatePartition
-                    - glue:CreatePartition
-                    - glue:UpdatePartition
-                    - glue:GetPartition
-                  Resource:
-                    - !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:catalog'
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:database/${VpcFlowLogsAthenaDatabaseName}', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:database/${VpcFlowLogsAthenaDatabase}']
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabaseName}/${VpcFlowLogsAthenaTableName}', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabase}/${VpcFlowLogsAthenaTable}']
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabaseName}/vpc_flow_logs_summary_view', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabase}/vpc_flow_logs_summary_view']
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabaseName}/vpc_flow_logs_daily_view', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabase}/vpc_flow_logs_daily_view']
-                    - !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabaseName}/vpc_flow_logs_enhanced_view', !Sub 'arn:aws:glue:${S3BucketRegion}:${AWS::AccountId}:table/${VpcFlowLogsAthenaDatabase}/vpc_flow_logs_enhanced_view']
-                - Effect: Allow
-                  Action:
-                    - s3:GetObjectAcl
-                    - s3:GetObject
-                    - s3:GetObjectTagging
-                    - s3:GetBucketPolicy
-                  Resource:
-                    - !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}'
-                    - !Sub 'arn:aws:s3:::${VpcFlowLogsBucketName}/*'
-        Tags:
-          -
-            Key: Name
-            Value: VPCFlowLogs-Lambda-Role
-          -
-            Key: Purpose
-            Value: WALabVPCFlowLogs
-    # Create Athena view for VPC Flow Logs
-  # Creates a lambda fuction to add partitions to VPC Flow Logs external table
-  VPCAthenaPartitionsFunction:
-      Type: AWS::Lambda::Function
-      Properties:
-        Description: Adds partitions to Athena table for current day. Triggered by Cloudwatch scheduler with daily frequency.
-        Handler: index.lambda_handler
-        Runtime: python3.8
-        Role: !GetAtt 'VPCFlowLogsAthenaIntegrationLambdaExecutorRole.Arn'
-        Timeout: 30
-        Code:
-          ZipFile: |
-
-            import boto3
-            import datetime
-            import time
-            import re
-            import cfnresponse
-
-            #S3 and Athena client
-            s3 = boto3.client('s3')
-            athena = boto3.client('athena')
-
-            #Get Year, Month, Day for partition
-            date = datetime.datetime.now()
-            athena_year = str(date.year)
-            athena_month = str(date.month).rjust(2, '0')
-            athena_day = str(date.day).rjust(2, '0')
-
-            #Parameters for S3 log location and Athena table (Fill this carefully)
-            s3_buckcet_flow_log = '' # '<s3 bucket name where flow logs will be stored>'
-            s3_account_prefix = 'vpc-flow-logs/AWSLogs/' # '<prefix for VPC flow logs that comes after bucket name>' e.g. 'vpc-flow-logs'
-            s3_ouput = '<S3 bucket URL where Athena query results are stored>'
-            # e.g. 's3://aws-athena-query-results-us-east-1-<account number>'
-            database = ''
-            table_name = '' # '<Athena table name for VPC flow logs>'
-
-            #Executing the athena query:
-            def run_query(query, database, s3_output):
-              try:
-                query_response = athena.start_query_execution(
-                QueryString=query,
-                QueryExecutionContext={
-                    'Database': database
-                    },
-                ResultConfiguration={
-                    'OutputLocation': s3_output,
-                    }
-                )
-                
-                execution_id=query_response['QueryExecutionId']
-                state = 'RUNNING'
-                while (state in ['RUNNING', 'QUEUED']):
-                    response = athena.get_query_execution(QueryExecutionId=execution_id)
-                    if 'QueryExecution' in response and 'Status' in response['QueryExecution'] and 'State' in \
-                            response['QueryExecution']['Status']:
-                        state = response['QueryExecution']['Status']['State']
-                        if state == 'FAILED':
-                            print(response)
-                            print("state == FAILED")
-                            print('Execution ID: ' + query_response['QueryExecutionId'])
-                            return False
-                        elif state == 'SUCCEEDED':
-                            s3_path = response['QueryExecution']['ResultConfiguration']['OutputLocation']
-                            filename = re.findall('.*\/(.*)', s3_path)[0]
-                            return filename
-                    time.sleep(1)
-              except Exception as e:
-                print("Query Exception:- ", e)
-
-              return query_response
-
-            #Function to get the regions and run the query on the captured regions
-            def lambda_handler(event, context):
-              errs = None
-              status = cfnresponse.SUCCESS
-              account_id=None
-              region=None
-
-              database = event["ResourceProperties"]["dbName"] if event.get("ResourceProperties") != None else event["dbName"]
-              table_name = event["ResourceProperties"]["VPCTableName"] if event.get("ResourceProperties") != None else event["VPCTableName"]
-              frequency = event["ResourceProperties"]["frequency"] if event.get("ResourceProperties") != None else event["frequency"]
-              s3_buckcet_flow_log = event["ResourceProperties"]["VpcFlowLogsBucketName"] if event.get("ResourceProperties") != None else event["VpcFlowLogsBucketName"]
-              s3_ouput = event["ResourceProperties"]["s3Output"] if event.get("ResourceProperties") != None else event["s3Output"]
-              s3_account_prefix=event["ResourceProperties"]["VpcFlowLogsFilePrefix"] + "AWSLogs/" if event.get("ResourceProperties") != None else event["VpcFlowLogsFilePrefix"] + "AWSLogs/"
-              hive_compatible_s3_prefix = event["ResourceProperties"]["HiveCompatibleS3prefix"] if event.get("ResourceProperties") != None else event["HiveCompatibleS3prefix"]
-              account_result = s3.list_objects(Bucket=s3_buckcet_flow_log,Prefix=s3_account_prefix, Delimiter='/')
-
-              if event.get("RequestType") == 'Delete':
-                status = cfnresponse.SUCCESS
-                cfnresponse.send(event, context, status, errs, event["LogicalResourceId"])
-              else:
-                try:
-                  for accounts in account_result.get('CommonPrefixes'):
-                    get_account=(accounts.get('Prefix','').replace(s3_account_prefix,'').replace('/',''))
-                    if get_account.find("=") >0: account_id=get_account.split("=")[1]
-                    s3_prefix = s3_account_prefix + get_account + '/aws-service=vpcflowlogs/'
-                    s3_input = 's3://' + s3_buckcet_flow_log + '/' + s3_prefix
-                    
-                    result =  s3.list_objects(Bucket=s3_buckcet_flow_log,Prefix=s3_prefix, Delimiter='/')                    
-                    for regions in result.get('CommonPrefixes'):
-                      get_region=(regions.get('Prefix','').replace(s3_prefix,'').replace('/',''))
-                      if get_region.find("=") >0: region=get_region.split("=")[1]
-                      query = str("ALTER TABLE "+ database + "." + table_name +" ADD PARTITION (`aws-account-id`=\""
-                              + account_id + "\", `aws-service`=\"vpcflowlogs\", `aws-region`=\""
-                              + region + "\", year=\""
-                              + athena_year + "\", month=\""
-                              + athena_month + "\", day=\""
-                              + athena_day + "\"")
-                      if frequency == "Hourly":
-                          query += ", hour=\"00\")"
-                      else:
-                          query += ")"
-                      query += " location '" + s3_input + get_region + "/year=" + athena_year + "/month=" + athena_month + "/day=" + athena_day
-                      if frequency == "Hourly":
-                          query += "/hour=00';"
-                      else:
-                          query += "';"
-                      ## Enable below prints for debugging ##
-                      print("*" * 10, "START",  "*" * 10) # -- for debug
-                      print(get_region) # -- for debug
-                      print(query) # -- for debug
-                      print("*" * 10, "START",  "*" * 10) # -- for debug
-                      print(database) # -- for debug
-                      print(s3_ouput) # -- for debug
-
-                      query_result=run_query(query, database, s3_ouput)
-
-                      print(query_result) # -- for debug
-                      print("*" * 10, "END",  "*" * 10) # -- for debug
-                    status = cfnresponse.SUCCESS
-                except Exception as e:
-                  print("lambda_handler Exception:- ", e)
-                  errs = e
-                  status = cfnresponse.FAILED
-                finally:
-                  if event.get("RequestType") != None: cfnresponse.send(event, context, status, {}, event.get("LogicalResourceId")) 
-        Tags:
-          -
-            Key: Name
-            Value: VPCFlowLogs-Lambda-Function
-          -
-            Key: Purpose
-            Value: WALabVPCFlowLogs
-  # Cloudwatch event rule that will be triggered daily for adding partitions to vpc flow logs Athena table            
-  DailyAddPartitionLambdaEventsRule:
-    Type: AWS::Events::Rule
-    Properties: 
-      Description: Event rule to trigger lambda function that adds partition to athena table for vpc flow logs.
-      Name: daily-add-vpc-logs-partitions
-      ScheduleExpression: "rate(1 day)"
-      State: ENABLED
-      Targets: 
-        - Arn: !Sub ${VPCAthenaPartitionsFunction.Arn}
-          Id: DailyAddPartitionLambdaEventsRule
-          Input: !If [ExistingVpcLogsAthenaDataBaseCondition, !Sub  '{"frequency": "Daily", "dbName": "${VpcFlowLogsAthenaDatabaseName}", "VPCTableName": "${VpcFlowLogsAthenaTableName}", "s3Output": "${AthenaResultsOutputLocation}", "VpcFlowLogsBucketName": "${VpcFlowLogsBucketName}", "VpcFlowLogsFilePrefix": "${VpcFlowLogsFilePrefix}", "HiveCompatibleS3prefix": "${HiveCompatibleS3prefix}"}', !Sub  '{"frequency": "Daily", "dbName": "${VpcFlowLogsAthenaDatabase}", "VPCTableName": "${VpcFlowLogsAthenaTable}", "s3Output": "${AthenaResultsOutputLocation}", "VpcFlowLogsBucketName": "${VpcFlowLogsBucketName}", "VpcFlowLogsFilePrefix": "${VpcFlowLogsFilePrefix}", "HiveCompatibleS3prefix": "${HiveCompatibleS3prefix}"}']   
-  # Creates permission for cloudwatch events to execute lambda function
-  PermissionForEventsToInvokeLambda: 
-    Type: AWS::Lambda::Permission
-    Properties: 
-      FunctionName: !Sub ${VPCAthenaPartitionsFunction.Arn}
-      Action: "lambda:InvokeFunction"
-      Principal: "events.amazonaws.com"
-      SourceArn: 
-        Fn::GetAtt: 
-          - "DailyAddPartitionLambdaEventsRule"
-          - "Arn"
-  # Creates an initializer trigger Athena partition lambda function invokation 
-  CreatePartitionInitializer:
-    Type: 'Custom::VPCFlowLogsAthenaPartitionInitializer'
-    DependsOn:
-      - VPCAthenaPartitionsFunction
-    Properties:
-      ServiceToken: !GetAtt VPCAthenaPartitionsFunction.Arn
-      dbName: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-      VPCTableName: !If [ExistingVpcLogsAthenaTableCondition, !Ref VpcFlowLogsAthenaTableName, !Ref VpcFlowLogsAthenaTable]
-      service: vpcflowlogs
-      frequency: "Daily"
-      s3Output: !Ref AthenaResultsOutputLocation
-      VpcFlowLogsBucketName: !Ref VpcFlowLogsBucketName
-      VpcFlowLogsFilePrefix: !Ref VpcFlowLogsFilePrefix
-      HiveCompatibleS3prefix: !Ref HiveCompatibleS3prefix
-  # Creates Athena View for VPC Flow Logs
-  VPCAthenaViewFunction:
-      Type: AWS::Lambda::Function
-      Properties:
-        Description: Creates Athena view for VPC FLow Logs external table
-        Handler: index.lambda_handler
-        Runtime: python3.8
-        Role: !GetAtt 'VPCFlowLogsAthenaIntegrationLambdaExecutorRole.Arn'
-        Timeout: 60
-        Code:
-          ZipFile: |
-
-            import boto3
-            import datetime
-            import time
-            import re
-            import cfnresponse
-
-            # S3 and Athena client
-            s3 = boto3.client('s3')
-            athena = boto3.client('athena')
-
-            #Executing the athena query:
-            def run_query(query, database, s3_output):
-              try:
-                query_response = athena.start_query_execution(
-                QueryString=query,
-                QueryExecutionContext={
-                    'Database': database
-                    },
-                ResultConfiguration={
-                    'OutputLocation': s3_output,
-                    }
-                )
-                
-                execution_id=query_response['QueryExecutionId']
-                state = 'RUNNING'
-                while (state in ['RUNNING', 'QUEUED']):
-                    response = athena.get_query_execution(QueryExecutionId=execution_id)
-                    if 'QueryExecution' in response and 'Status' in response['QueryExecution'] and 'State' in \
-                            response['QueryExecution']['Status']:
-                        state = response['QueryExecution']['Status']['State']
-                        if state == 'FAILED':
-                            print(response)
-                            print("state == FAILED")
-                            print('Execution ID: ' + query_response['QueryExecutionId'])
-                            return False
-                        elif state == 'SUCCEEDED':
-                            s3_path = response['QueryExecution']['ResultConfiguration']['OutputLocation']
-                            filename = re.findall('.*\/(.*)', s3_path)[0]
-                            return filename
-                    time.sleep(1)
-              except Exception as e:
-                print("Query Exception:- ", e)
-
-              return query_response
-
-            #Function to get the regions and run the query on the captured regions
-            def lambda_handler(event, context):
-                errs = None
-                status = cfnresponse.SUCCESS
-                database = event["ResourceProperties"]["athenaIntegrations"][0]["database"]
-                s3_output = event["ResourceProperties"]["athenaIntegrations"][0]["s3_output"]
-                vpc_table_name = event["ResourceProperties"]["athenaIntegrations"][0]["vpc_table_name"]
-                if event.get("RequestType") == 'Delete':
-                  status = cfnresponse.SUCCESS
-                  cfnresponse.send(event, context, status, errs, event["LogicalResourceId"])
-                else:
-                  try:
-                    ## Enable below prints for debugging ##
-                    # print("*" * 10, "START",  "*" * 10) # -- for debug
-                    summary_query = summary_view_query(vpc_table_name)
-                    daily_query = daily_view_query(vpc_table_name)
-                    enh_query = enhanced_view_query(vpc_table_name)
-                    print(summary_query) # -- for debug
-                    print(daily_query) # -- for debug
-                    print(enh_query) # -- for debug
-                    #print(database) # -- for debug
-                    #print(s3_output) # -- for debug
-                    query_result=run_query(summary_query, database, s3_output)
-                    # print(query_result) # -- for debug
-                    query_result=run_query(daily_query, database, s3_output)
-                    # print(query_result) # -- for debug
-                    query_result=run_query(enh_query, database, s3_output)
-                    # print(query_result) # -- for debug
-                    # print("*" * 10, "END",  "*" * 10) # -- for debug
-                    status = cfnresponse.SUCCESS
-                  except Exception as e:
-                    print("Query Exception:- ", e)
-                    errs = e
-                    status = cfnresponse.FAILED
-                  finally:
-                    status = cfnresponse.SUCCESS
-                    if event.get("RequestType") != None: cfnresponse.send(event, context, status, {}, event.get("LogicalResourceId"))
-            def summary_view_query(vpc_table_name):
-                query = str("CREATE OR REPLACE VIEW vpc_flow_logs_summary_view AS SELECT"
-                      + " \"account_id\" \"accountid\" "
-                      + ", \"interface_id\" \"interfaceid\" "
-                      + ", \"srcaddr\" \"sourceaddress\" "
-                      + ", \"dstaddr\" \"destinationaddress\" "
-                      + ", \"srcport\" \"sourceport\" "
-                      + ", \"dstport\" \"destinationport\" "
-                      + ", \"protocol\" \"protocol\" "
-                      + ", \"sum\"(\"packets\") \"numpackets\" "
-                      + ", \"sum\"(\"bytes\") \"numbytes\" "
-                      + ", \"action\" \"action\" "
-                      + ", \"count\"(\"action\") \"action_count\" "
-                      + ", \"log_status\" \"logstatus\" "
-                      + ", \"count\"(\"log_status\") \"log_status_count\" "
-                      + ", \"vpc_id\" \"vpcid\" "
-                      + ", \"az_id\" \"azid\" "
-                      + ", \"pkt_srcaddr\" \"packetsourceaddr\" "
-                      + ", \"pkt_dstaddr\" \"packetdestinationaddr\" "
-                      + ", \"region\" \"region\" "
-                      + ", \"subnet_id\" \"subnetid\" "
-                      + ", (CASE WHEN (CAST(\"tcp_flags\" AS varchar) = '1') THEN 'FIN' WHEN (CAST(\"tcp_flags\" AS varchar) = '2') THEN 'SYN' WHEN (CAST(\"tcp_flags\" AS varchar) = '3') THEN 'SYN-FIN' WHEN (CAST(\"tcp_flags\" AS varchar) = '4') THEN 'RST' WHEN (CAST(\"tcp_flags\" AS varchar) = '8') THEN 'PSH' WHEN (CAST(\"tcp_flags\" AS varchar) = '16') THEN 'ACK' WHEN (CAST(\"tcp_flags\" AS varchar) = '18') THEN 'SYN-ACK' WHEN (CAST(\"tcp_flags\" AS varchar) = '19') THEN 'SYN-ACK-FIN' WHEN (CAST(\"tcp_flags\" AS varchar) = '32') THEN 'URG' ELSE CAST(\"tcp_flags\" AS varchar) END) \"tcpflags\" "
-                      + ", \"tcp_flags\" \"tcp_flags\" "
-                      + ", \"count\"(\"tcp_flags\") \"tcp_flags_count\" "
-                      + ", \"flow_direction\" \"flowdirection\" "
-                      + ", \"pkt_src_aws_service\" \"packetsrcawsservice\" "
-                      + ", \"pkt_dst_aws_service\" \"packetdstawsservice\" "
-                      + ", (CASE WHEN (CAST(\"traffic_path\" AS varchar) = '1') THEN 'ResourceInSameVPC' WHEN (CAST(\"traffic_path\" AS varchar) = '2') THEN 'IGW-OR-GatewayVPCEndpoint' WHEN (CAST(\"traffic_path\" AS varchar) = '3') THEN 'VirtualPrivateGateway' WHEN (CAST(\"traffic_path\" AS varchar) = '4') THEN 'Intra-RegionVPCPeering' WHEN (CAST(\"traffic_path\" AS varchar) = '5') THEN 'Inter-RegionVPCPeering' WHEN (CAST(\"traffic_path\" AS varchar) = '6') THEN 'LocalGateway' WHEN (CAST(\"traffic_path\" AS varchar) = '7') THEN 'GatewayVPCEndpoint' WHEN (CAST(\"traffic_path\" AS varchar) = '8') THEN 'InternetGateway' ELSE CAST(\"traffic_path\" AS varchar) END) \"trafficpath\" "
-                      + ", \"traffic_path\" \"traffic_path\" "
-                      + ", \"type\" \"iptype\" "
-                      + "FROM " + vpc_table_name
-                      + " WHERE (((year = format_datetime(current_timestamp, 'YYYY')) AND (month = format_datetime(current_timestamp, 'MM'))) OR ((year = format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH), 'YYYY')) AND (month = format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH), 'MM')))) "
-                      + "GROUP BY account_id, interface_id, srcaddr, dstaddr, srcport, dstport, protocol, action, log_status, vpc_id, az_id, pkt_srcaddr, pkt_dstaddr, region, subnet_id, tcp_flags, flow_direction, pkt_src_aws_service, pkt_dst_aws_service, traffic_path, type;")
-                return query
-              
-            def daily_view_query(vpc_table_name):
-                query = str("CREATE OR REPLACE VIEW vpc_flow_logs_daily_view AS "
-                            + "   SELECT "
-                            + "     \"account_id\" \"accountid\" "
-                            + "   , \"interface_id\" \"interfaceid\" "
-                            + "   , \"srcaddr\" \"sourceaddress\" "
-                            + "   , \"dstaddr\" \"destinationaddress\" "
-                            + "   , \"srcport\" \"sourceport\" "
-                            + "   , \"dstport\" \"destinationport\" "
-                            + "   , \"protocol\" \"protocol\" "
-                            + "   , \"sum\"(\"packets\") \"numpackets\" "
-                            + "   , \"sum\"(\"bytes\") \"numbytes\" "
-                            + "   , \"start\" \"starttime\" "
-                            + "   , \"end\" \"endtime\" "
-                            + "   , \"action\" \"action\" "
-                            + "   , \"count\"(\"action\") \"action_count\" "
-                            + "   , \"log_status\" \"logstatus\" "
-                            + "   , \"vpc_id\" \"vpcid\" "
-                            + "   , \"az_id\" \"azid\" " 
-                            + "   , \"pkt_srcaddr\" \"packetsourceaddr\" "
-                            + "   , \"pkt_dstaddr\" \"packetdestinationaddr\" "
-                            + "   , \"region\" \"region\" "
-                            + "   , \"subnet_id\" \"subnetid\" "
-                            + "   , (CASE WHEN (CAST(\"tcp_flags\" AS varchar) = '1') THEN 'FIN' WHEN (CAST(\"tcp_flags\" AS varchar) = '2') THEN 'SYN' WHEN (CAST(\"tcp_flags\" AS varchar) = '3') THEN 'SYN-FIN' WHEN (CAST(\"tcp_flags\" AS varchar) = '4') THEN 'RST' WHEN (CAST(\"tcp_flags\" AS varchar) = '8') THEN 'PSH' WHEN (CAST(\"tcp_flags\" AS varchar) = '16') THEN 'ACK' WHEN (CAST(\"tcp_flags\" AS varchar) = '18') THEN 'SYN-ACK' WHEN (CAST(\"tcp_flags\" AS varchar) = '19') THEN 'SYN-ACK-FIN' WHEN (CAST(\"tcp_flags\" AS varchar) = '32') THEN 'URG' ELSE CAST(\"tcp_flags\" AS varchar) END) \"tcpflags\" "
-                            + "   , \"tcp_flags\" \"tcp_flags\" "
-                            + "   , \"flow_direction\" \"flowdirection\" "
-                            + "   , (CASE WHEN (CAST(\"traffic_path\" AS varchar) = '1') THEN 'ResourceInSameVPC' WHEN (CAST(\"traffic_path\" AS varchar) = '2') THEN 'IGW-OR-GatewayVPCEndpoint' WHEN (CAST(\"traffic_path\" AS varchar) = '3') THEN 'VirtualPrivateGateway' WHEN (CAST(\"traffic_path\" AS varchar) = '4') THEN 'Intra-RegionVPCPeering' WHEN (CAST(\"traffic_path\" AS varchar) = '5') THEN 'Inter-RegionVPCPeering' WHEN (CAST(\"traffic_path\" AS varchar) = '6') THEN 'LocalGateway' WHEN (CAST(\"traffic_path\" AS varchar) = '7') THEN 'GatewayVPCEndpoint' WHEN (CAST(\"traffic_path\" AS varchar) = '8') THEN 'InternetGateway' ELSE CAST(\"traffic_path\" AS varchar) END) \"trafficpath\" "
-                            + "   , \"traffic_path\" \"traffic_path\" "
-                            + "   , \"type\" \"iptype\" "
-                            + "   , CAST(\"date_format\"(\"from_unixtime\"(\"start\"), '%d') AS integer) \"startday\" "
-                            + "   , CAST(\"date_format\"(\"from_unixtime\"(\"start\"), '%m') AS integer) \"startmonth\" "
-                            + "   , CAST(\"date_format\"(\"from_unixtime\"(\"end\"), '%d') AS integer) \"endday\" "
-                            + "   , CAST(\"date_format\"(\"from_unixtime\"(\"end\"), '%m') AS integer) \"endmonth\" "
-                            + "   FROM " + vpc_table_name
-                            + " WHERE (((year = format_datetime(current_timestamp, 'YYYY')) AND (month = format_datetime(current_timestamp, 'MM'))) OR ((year = format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH), 'YYYY')) AND (month = format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH), 'MM')))) "
-                            + "GROUP BY \"account_id\", \"interface_id\", \"srcaddr\", \"dstaddr\", \"srcport\", \"dstport\", \"protocol\", \"start\", \"end\", \"action\", \"log_status\", \"vpc_id\", \"az_id\", \"pkt_srcaddr\", \"pkt_dstaddr\", \"region\", \"subnet_id\", \"tcp_flags\", \"flow_direction\", \"traffic_path\", \"type\" ORDER BY startmonth ASC, startday ASC;")
-                return query
-              
-            def enhanced_view_query(vpc_table_name):
-                query =str("CREATE OR REPLACE VIEW vpc_flow_logs_enhanced_view AS "
-                              + " SELECT "
-                              + "   \"account_id\" \"accountid\" "
-                              + " , \"srcaddr\" \"sourceaddress\" "
-                              + " , \"dstaddr\" \"destinationaddress\" "
-                              + " , \"sum\"(\"packets\") \"numpackets\" "
-                              + " , \"sum\"(\"bytes\") \"numbytes\" "
-                              + " , \"vpc_id\" \"vpcid\" "
-                              + " , \"az_id\" \"azid\" "
-                              + " , \"pkt_srcaddr\" \"packetsourceaddr\" "
-                              + " , \"pkt_dstaddr\" \"packetdestinationaddr\" "
-                              + " , \"region\" \"region\" "
-                              + " , \"subnet_id\" \"subnetid\" "
-                              + " , \"flow_direction\" \"flowdirection\" "
-                              + " , \"pkt_src_aws_service\" \"packetsrcawsservice\" "
-                              + " , \"pkt_dst_aws_service\" \"packetdstawsservice\" "
-                              + " , (CASE WHEN (CAST(\"traffic_path\" AS varchar) = '1') THEN 'ResourceInSameVPC' WHEN (CAST(\"traffic_path\" AS varchar) = '2') THEN 'IGW-OR-GatewayVPCEndpoint' WHEN (CAST(\"traffic_path\" AS varchar) = '3') THEN 'VirtualPrivateGateway' WHEN (CAST(\"traffic_path\" AS varchar) = '4') THEN 'Intra-RegionVPCPeering' WHEN (CAST(\"traffic_path\" AS varchar) = '5') THEN 'Inter-RegionVPCPeering' WHEN (CAST(\"traffic_path\" AS varchar) = '6') THEN 'LocalGateway' WHEN (CAST(\"traffic_path\" AS varchar) = '7') THEN 'GatewayVPCEndpoint' WHEN (CAST(\"traffic_path\" AS varchar) = '8') THEN 'InternetGateway' ELSE CAST(\"traffic_path\" AS varchar) END) \"trafficpath\" "
-                              + " , \"traffic_path\" \"traffic_path\" "
-                              + " FROM " + vpc_table_name
-                              + " WHERE (((((year = format_datetime(current_timestamp, 'YYYY')) AND (month = format_datetime(current_timestamp, 'MM'))) OR ((year = format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH), 'YYYY')) AND (month = format_datetime((date_trunc('month', current_timestamp) - INTERVAL  '1' MONTH), 'MM')))) AND (((pkt_src_aws_service <> '') OR (pkt_dst_aws_service <> '')) OR (traffic_path >= 0))) AND ((pkt_src_aws_service <> '-') OR (pkt_dst_aws_service <> '-'))) "
-                              + " GROUP BY \"account_id\", \"srcaddr\", \"dstaddr\", \"dstport\", \"protocol\", \"vpc_id\", \"az_id\", \"pkt_srcaddr\", \"pkt_dstaddr\", \"region\", \"subnet_id\", \"flow_direction\", \"pkt_src_aws_service\", \"pkt_dst_aws_service\", \"traffic_path\";")
-                return query
-        Tags:
-          -
-            Key: Name
-            Value: VPCFlowLogs-Lambda-Function
-          -
-            Key: Purpose
-            Value: WALabVPCFlowLogs
-  # Creates an initializer trigger to Athena View lambda function invokation 
-  CreateAthenaViewInitializer:
-    Type: 'Custom::VPCFlowLogsAthenaViewStartInitializer'
-    DependsOn:
-      - VPCAthenaViewFunction
-    Properties:
-      ServiceToken: !GetAtt VPCAthenaViewFunction.Arn
-      dbName: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-      service: vpcflowlogs
-      athenaIntegrations:
-        - s3_output: !Ref AthenaResultsOutputLocation
-          database: !If [ExistingVpcLogsAthenaDataBaseCondition, !Ref VpcFlowLogsAthenaDatabaseName, !Sub '${VpcFlowLogsAthenaDatabase}']
-          vpc_table_name: !If [ExistingVpcLogsAthenaTableCondition, !Ref VpcFlowLogsAthenaTableName, !Ref VpcFlowLogsAthenaTable]
-Outputs:
-  StackName:
-    Description: 'Stack name'
-    Value: !Sub '${AWS::StackName}'
diff --git a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_multi_view_template.yaml b/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_multi_view_template.yaml
deleted file mode 100644
index b8c2489d7..000000000
--- a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_multi_view_template.yaml
+++ /dev/null
@@ -1,403 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Template creates Athena Database, View, QuickSight Athena Datasource, Dataset and Dashboard for VPC Flow Logs'
-Parameters:
-  VpcFlowLogsAthenaDatabaseName:
-    Type: String
-    Description: Athena database name where external table for VPC flow logs is created
-  QuickSightUserArn:
-    Type: String
-    Description: Amazon QuickSight current logged in user's ARN
-    Default: ''
-Resources:
-  # Creates a datasource for athena.
-  VpcFlowLogsAthenaDatasource:
-    Type: AWS::QuickSight::DataSource
-    Properties:
-      Type: ATHENA
-      DataSourceId: myathena-datasource-01
-      AwsAccountId: !Ref AWS::AccountId
-      DataSourceParameters: 
-          AthenaParameters:
-            "WorkGroup": "primary"
-      Name: VPCFlowLogsDataset
-      SslProperties: 
-        DisableSsl: false
-  # Creates Athena dataset for VPC Flow Logs
-  VpcFlowLogsAthenaSummaryDataset:
-    Type: AWS::QuickSight::DataSet
-    Properties: 
-      AwsAccountId: !Ref AWS::AccountId
-      Name: vpc_flow_logs_summary_view
-      DataSetId: vpcflathena-summary-datasetid-01
-      ImportMode: SPICE
-      PhysicalTableMap:
-        VPCFlowLogsPhysicalTableMap123:
-          RelationalTable:
-            DataSourceArn: !GetAtt VpcFlowLogsAthenaDatasource.Arn
-            Catalog: "AwsDataCatalog"
-            Schema: !Ref VpcFlowLogsAthenaDatabaseName
-            Name: "vpc_flow_logs_summary_view"
-            InputColumns:
-              - Name: accountid
-                Type: STRING
-              - Name: interfaceid
-                Type: STRING
-              - Name: sourceaddress
-                Type: STRING
-              - Name: destinationaddress
-                Type: STRING
-              - Name: sourceport
-                Type: INTEGER
-              - Name: destinationport
-                Type: INTEGER
-              - Name: protocol
-                Type: INTEGER
-              - Name: numpackets
-                Type: INTEGER
-              - Name: numbytes
-                Type: INTEGER
-              - Name: action
-                Type: STRING
-              - Name: action_count
-                Type: INTEGER
-              - Name: logstatus
-                Type: STRING
-              - Name: log_status_count
-                Type: INTEGER
-              - Name: vpcid
-                Type: STRING
-              - Name: azid
-                Type: STRING
-              - Name: packetsourceaddr
-                Type: STRING
-              - Name: packetdestinationaddr
-                Type: STRING
-              - Name: region
-                Type: STRING
-              - Name: subnetid
-                Type: STRING
-              - Name: tcpflags
-                Type: STRING
-              - Name: tcp_flags
-                Type: INTEGER  
-              - Name: tcp_flags_count
-                Type: INTEGER
-              - Name: flowdirection
-                Type: STRING
-              - Name: packetsrcawsservice
-                Type: STRING
-              - Name: packetdstawsservice
-                Type: STRING
-              - Name: trafficpath
-                Type: STRING
-              - Name: traffic_path
-                Type: INTEGER
-              - Name: iptype
-                Type: STRING
-      LogicalTableMap:
-        VPCFlowLogsLogicalTableMap123:
-          Alias: "vpc_flow_logs_summary_view"
-          Source: 
-            PhysicalTableId: VPCFlowLogsPhysicalTableMap123
-          DataTransforms:
-            - TagColumnOperation:
-                ColumnName: 'region'
-                Tags:
-                  - ColumnGeographicRole: STATE
-            - ProjectOperation:
-                ProjectedColumns:
-                  - accountid
-                  - interfaceid
-                  - sourceaddress
-                  - destinationaddress
-                  - sourceport
-                  - destinationport
-                  - protocol
-                  - numpackets
-                  - numbytes
-                  - action
-                  - action_count
-                  - logstatus
-                  - log_status_count
-                  - vpcid
-                  - azid
-                  - packetsourceaddr
-                  - packetdestinationaddr
-                  - region
-                  - subnetid
-                  - tcpflags
-                  - tcp_flags
-                  - tcp_flags_count
-                  - flowdirection
-                  - packetsrcawsservice
-                  - packetdstawsservice
-                  - trafficpath
-                  - traffic_path
-                  - iptype
-      Permissions:
-        - Principal: !Ref QuickSightUserArn
-          Actions:
-            - "quicksight:UpdateDataSetPermissions"
-            - "quicksight:DescribeDataSet"
-            - "quicksight:DescribeDataSetPermissions"
-            - "quicksight:PassDataSet"
-            - "quicksight:DescribeIngestion"
-            - "quicksight:ListIngestions"
-            - "quicksight:UpdateDataSet"
-            - "quicksight:DeleteDataSet"
-            - "quicksight:CreateIngestion"
-            - "quicksight:CancelIngestion"
-  # Creates Athena dataset for VPC Flow Logs
-  VpcFlowLogsAthenaDailyDataset:
-    Type: AWS::QuickSight::DataSet
-    Properties: 
-      AwsAccountId: !Ref AWS::AccountId
-      Name: vpc_flow_logs_daily_view
-      DataSetId: myathena-daily-datasetid-01
-      ImportMode: DIRECT_QUERY
-      PhysicalTableMap:
-        VPCFlowLogsPhysicalTableMap123:
-          RelationalTable:
-            DataSourceArn: !GetAtt VpcFlowLogsAthenaDatasource.Arn
-            Catalog: "AwsDataCatalog"
-            Schema: !Ref VpcFlowLogsAthenaDatabaseName
-            Name: "vpc_flow_logs_daily_view"
-            InputColumns:
-              - Name: accountid
-                Type: STRING
-              - Name: interfaceid
-                Type: STRING
-              - Name: sourceaddress
-                Type: STRING
-              - Name: destinationaddress
-                Type: STRING
-              - Name: sourceport
-                Type: INTEGER
-              - Name: destinationport
-                Type: INTEGER
-              - Name: protocol
-                Type: INTEGER
-              - Name: numpackets
-                Type: INTEGER
-              - Name: numbytes
-                Type: INTEGER
-              - Name: starttime
-                Type: INTEGER
-              - Name: endtime
-                Type: INTEGER
-              - Name: action
-                Type: STRING
-              - Name: action_count
-                Type: INTEGER
-              - Name: logstatus
-                Type: STRING
-              - Name: vpcid
-                Type: STRING
-              - Name: azid
-                Type: STRING
-              - Name: packetsourceaddr
-                Type: STRING
-              - Name: packetdestinationaddr
-                Type: STRING
-              - Name: region
-                Type: STRING
-              - Name: subnetid
-                Type: STRING
-              - Name: tcpflags
-                Type: STRING
-              - Name: tcp_flags
-                Type: INTEGER  
-              - Name: flowdirection
-                Type: STRING
-              - Name: trafficpath
-                Type: STRING
-              - Name: traffic_path
-                Type: INTEGER
-              - Name: iptype
-                Type: STRING
-              - Name: startday
-                Type: INTEGER
-              - Name: startmonth
-                Type: INTEGER
-              - Name: endday
-                Type: INTEGER
-              - Name: endmonth
-                Type: INTEGER
-      LogicalTableMap:
-        VPCFlowLogsLogicalTableMap123:
-          Alias: "vpc_flow_logs_daily_view"
-          Source: 
-            PhysicalTableId: VPCFlowLogsPhysicalTableMap123
-          DataTransforms:
-            - TagColumnOperation:
-                ColumnName: 'region'
-                Tags:
-                  - ColumnGeographicRole: STATE
-            - ProjectOperation:
-                ProjectedColumns:
-                  - accountid
-                  - interfaceid
-                  - sourceaddress
-                  - destinationaddress
-                  - sourceport
-                  - destinationport
-                  - protocol
-                  - numpackets
-                  - numbytes
-                  - starttime
-                  - endtime
-                  - action
-                  - action_count
-                  - logstatus
-                  - vpcid
-                  - azid
-                  - packetsourceaddr
-                  - packetdestinationaddr
-                  - region
-                  - subnetid
-                  - tcpflags
-                  - tcp_flags
-                  - flowdirection
-                  - trafficpath
-                  - traffic_path
-                  - iptype
-                  - startday
-                  - startmonth
-                  - endday
-                  - endmonth
-      Permissions:
-        - Principal: !Ref QuickSightUserArn
-          Actions:
-            - "quicksight:UpdateDataSetPermissions"
-            - "quicksight:DescribeDataSet"
-            - "quicksight:DescribeDataSetPermissions"
-            - "quicksight:PassDataSet"
-            - "quicksight:DescribeIngestion"
-            - "quicksight:ListIngestions"
-            - "quicksight:UpdateDataSet"
-            - "quicksight:DeleteDataSet"
-            - "quicksight:CreateIngestion"
-            - "quicksight:CancelIngestion"
-  # Creates Athena dataset for VPC Flow Logs
-  VpcFlowLogsAthenaEnhancedDataset:
-    Type: AWS::QuickSight::DataSet
-    Properties: 
-      AwsAccountId: !Ref AWS::AccountId
-      Name: vpc_flow_logs_enhanced_view
-      DataSetId: myathena-enh-datasetid-01
-      ImportMode: DIRECT_QUERY
-      PhysicalTableMap:
-        VPCFlowLogsPhysicalTableMap123:
-          RelationalTable:
-            DataSourceArn: !GetAtt VpcFlowLogsAthenaDatasource.Arn
-            Catalog: "AwsDataCatalog"
-            Schema: !Ref VpcFlowLogsAthenaDatabaseName
-            Name: "vpc_flow_logs_enhanced_view"
-            InputColumns:
-              - Name: accountid
-                Type: STRING
-              - Name: sourceaddress
-                Type: STRING
-              - Name: destinationaddress
-                Type: STRING
-              - Name: numpackets
-                Type: INTEGER
-              - Name: numbytes
-                Type: INTEGER
-              - Name: vpcid
-                Type: STRING
-              - Name: azid
-                Type: STRING
-              - Name: packetsourceaddr
-                Type: STRING
-              - Name: packetdestinationaddr
-                Type: STRING
-              - Name: region
-                Type: STRING
-              - Name: subnetid
-                Type: STRING
-              - Name: flowdirection
-                Type: STRING
-              - Name: packetsrcawsservice
-                Type: STRING
-              - Name: packetdstawsservice
-                Type: STRING
-              - Name: trafficpath
-                Type: STRING
-              - Name: traffic_path
-                Type: INTEGER
-      LogicalTableMap:
-        VPCFlowLogsLogicalTableMap123:
-          Alias: "vpc_flow_logs_enhanced_view"
-          Source: 
-            PhysicalTableId: VPCFlowLogsPhysicalTableMap123
-          DataTransforms:
-            - TagColumnOperation:
-                ColumnName: 'region'
-                Tags:
-                  - ColumnGeographicRole: STATE
-            - ProjectOperation:
-                ProjectedColumns:
-                  - accountid
-                  - sourceaddress
-                  - destinationaddress
-                  - numpackets
-                  - numbytes
-                  - vpcid
-                  - azid
-                  - packetsourceaddr
-                  - packetdestinationaddr
-                  - region
-                  - subnetid
-                  - flowdirection
-                  - packetsrcawsservice
-                  - packetdstawsservice
-                  - trafficpath
-                  - traffic_path
-      Permissions:
-        - Principal: !Ref QuickSightUserArn
-          Actions:
-            - "quicksight:UpdateDataSetPermissions"
-            - "quicksight:DescribeDataSet"
-            - "quicksight:DescribeDataSetPermissions"
-            - "quicksight:PassDataSet"
-            - "quicksight:DescribeIngestion"
-            - "quicksight:ListIngestions"
-            - "quicksight:UpdateDataSet"
-            - "quicksight:DeleteDataSet"
-            - "quicksight:CreateIngestion"
-            - "quicksight:CancelIngestion"
-  # creates QuickSight VPC FLow Logs dashboard
-  VPCFlowLogsQuickSightDashboard:
-    Type: AWS::QuickSight::Dashboard
-    DependsOn: VpcFlowLogsAthenaSummaryDataset
-    Properties:
-      AwsAccountId: !Ref AWS::AccountId
-      DashboardId: 'vpc_flow_logs_analysis_dashboard'
-      Name: 'VPC Flow Logs Analysis Dashboard integrated with AWS VPC Service'
-      Permissions:
-        - Principal: !Ref QuickSightUserArn
-          Actions:
-            - "quicksight:DescribeDashboard"
-            - "quicksight:ListDashboardVersions"
-            - "quicksight:UpdateDashboardPermissions"
-            - "quicksight:QueryDashboard"
-            - "quicksight:UpdateDashboard"
-            - "quicksight:DeleteDashboard"
-            - "quicksight:DescribeDashboardPermissions"
-            - "quicksight:UpdateDashboardPublishedVersion"
-      SourceEntity:
-        SourceTemplate:
-          DataSetReferences:
-            - DataSetPlaceholder: 'vpc_flow_logs_summary_view'
-              DataSetArn: !GetAtt 'VpcFlowLogsAthenaSummaryDataset.Arn'
-            - DataSetPlaceholder: 'vpc_flow_logs_daily_view'
-              DataSetArn: !GetAtt 'VpcFlowLogsAthenaDailyDataset.Arn'
-            - DataSetPlaceholder: 'vpc_flow_logs_enhanced_view'
-              DataSetArn: !GetAtt 'VpcFlowLogsAthenaEnhancedDataset.Arn'
-          Arn: 'arn:aws:quicksight:us-east-1:869004330191:template/vpc-flow-logs-analysis-enhanced-template-v7'
-      VersionDescription: 'VPC Flow Logs Dashboard reInvent 2022- v7'
-Outputs:
-  StackName:
-    Description: 'Stack name'
-    Value: !Sub '${AWS::StackName}'
\ No newline at end of file
diff --git a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_template.yaml b/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_template.yaml
deleted file mode 100644
index 67f6c64a7..000000000
--- a/static/Security/300_VPC_Flow_Logs_Analysis_Dashboard/code/vpc_flowlogs_quicksight_template.yaml
+++ /dev/null
@@ -1,200 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Template creates Athena Database, View, QuickSight Athena Datasource, Dataset and Dashboard for VPC Flow Logs'
-Parameters:
-  VpcFlowLogsAthenaDatabaseName:
-    Type: String
-    Description: Athena database name where external table for VPC flow logs is created
-  QuickSightUserArn:
-    Type: String
-    Description: Amazon QuickSight current logged in user's ARN
-    Default: ''
-Resources:
-  # Creates a datasource for athena.
-  VpcFlowLogsAthenaDatasource:
-    Type: AWS::QuickSight::DataSource
-    Properties:
-      Type: ATHENA
-      DataSourceId: myathena-datasource-01
-      AwsAccountId: !Ref AWS::AccountId
-      DataSourceParameters: 
-          AthenaParameters:
-            "WorkGroup": "primary"
-      Name: VPCFlowLogsDataset
-      SslProperties: 
-        DisableSsl: false
-  # Creates Athena dataset for VPC Flow Logs
-  VpcFlowLogsAthenaDataset:
-    Type: AWS::QuickSight::DataSet
-    Properties: 
-      AwsAccountId: !Ref AWS::AccountId
-      Name: vpc_flow_logs_view
-      DataSetId: myathena-datasetid-01
-      ImportMode: DIRECT_QUERY
-      PhysicalTableMap:
-        VPCFlowLogsPhysicalTableMap123:
-          RelationalTable:
-            DataSourceArn: !GetAtt VpcFlowLogsAthenaDatasource.Arn
-            Catalog: "AwsDataCatalog"
-            Schema: !Ref VpcFlowLogsAthenaDatabaseName
-            Name: "vpc_flow_logs_view"
-            InputColumns:
-              - Name: version
-                Type: INTEGER
-              - Name: accountid
-                Type: STRING
-              - Name: interfaceid
-                Type: STRING
-              - Name: sourceaddress
-                Type: STRING
-              - Name: destinationaddress
-                Type: STRING
-              - Name: sourceport
-                Type: INTEGER
-              - Name: destinationport
-                Type: INTEGER
-              - Name: protocol
-                Type: INTEGER
-              - Name: numpackets
-                Type: INTEGER
-              - Name: numbytes
-                Type: INTEGER
-              - Name: starttime
-                Type: INTEGER
-              - Name: endtime
-                Type: INTEGER
-              - Name: action
-                Type: STRING
-              - Name: logstatus
-                Type: STRING
-              - Name: vpcid
-                Type: STRING
-              - Name: azid
-                Type: STRING
-              - Name: instanceid
-                Type: STRING
-              - Name: packetsourceaddr
-                Type: STRING
-              - Name: packetdestinationaddr
-                Type: STRING
-              - Name: region
-                Type: STRING
-              - Name: subnetid
-                Type: STRING
-              - Name: sublocationid
-                Type: STRING
-              - Name: sublocationtype
-                Type: STRING
-              - Name: tcpflags
-                Type: STRING
-              - Name: tcp_flags
-                Type: INTEGER  
-              - Name: flowdirection
-                Type: STRING
-              - Name: packetsrcawsservice
-                Type: STRING
-              - Name: packetdstawsservice
-                Type: STRING
-              - Name: trafficpath
-                Type: STRING
-              - Name: traffic_path
-                Type: INTEGER
-              - Name: iptype
-                Type: STRING
-              - Name: startday
-                Type: INTEGER
-              - Name: startmonth
-                Type: INTEGER
-              - Name: endday
-                Type: INTEGER
-              - Name: endmonth
-                Type: INTEGER
-      LogicalTableMap:
-        VPCFlowLogsLogicalTableMap123:
-          Alias: "vpc_flow_logs_view"
-          Source: 
-            PhysicalTableId: VPCFlowLogsPhysicalTableMap123
-          DataTransforms:
-            - TagColumnOperation:
-                ColumnName: 'region'
-                Tags:
-                  - ColumnGeographicRole: STATE
-            - ProjectOperation:
-                ProjectedColumns:
-                  - version
-                  - accountid
-                  - interfaceid
-                  - sourceaddress
-                  - destinationaddress
-                  - sourceport
-                  - destinationport
-                  - protocol
-                  - numpackets
-                  - numbytes
-                  - starttime
-                  - endtime
-                  - action
-                  - logstatus
-                  - vpcid
-                  - azid
-                  - instanceid
-                  - packetsourceaddr
-                  - packetdestinationaddr
-                  - region
-                  - subnetid
-                  - sublocationid
-                  - sublocationtype
-                  - tcpflags
-                  - tcp_flags
-                  - flowdirection
-                  - packetsrcawsservice
-                  - packetdstawsservice
-                  - trafficpath
-                  - traffic_path
-                  - iptype
-                  - startday
-                  - startmonth
-                  - endday
-                  - endmonth
-      Permissions:
-        - Principal: !Ref QuickSightUserArn
-          Actions:
-            - "quicksight:UpdateDataSetPermissions"
-            - "quicksight:DescribeDataSet"
-            - "quicksight:DescribeDataSetPermissions"
-            - "quicksight:PassDataSet"
-            - "quicksight:DescribeIngestion"
-            - "quicksight:ListIngestions"
-            - "quicksight:UpdateDataSet"
-            - "quicksight:DeleteDataSet"
-            - "quicksight:CreateIngestion"
-            - "quicksight:CancelIngestion"
-  # creates QuickSight VPC FLow Logs dashboard
-  VPCFlowLogsQuickSightDashboard:
-    Type: AWS::QuickSight::Dashboard
-    DependsOn: VpcFlowLogsAthenaDataset
-    Properties:
-      AwsAccountId: !Ref AWS::AccountId
-      DashboardId: 'vpc_flow_logs_analysis_dashboard'
-      Name: 'VPC Flow Logs Analysis Dashboard integrated with AWS VPC Service'
-      Permissions:
-        - Principal: !Ref QuickSightUserArn
-          Actions:
-            - "quicksight:DescribeDashboard"
-            - "quicksight:ListDashboardVersions"
-            - "quicksight:UpdateDashboardPermissions"
-            - "quicksight:QueryDashboard"
-            - "quicksight:UpdateDashboard"
-            - "quicksight:DeleteDashboard"
-            - "quicksight:DescribeDashboardPermissions"
-            - "quicksight:UpdateDashboardPublishedVersion"
-      SourceEntity:
-        SourceTemplate:
-          DataSetReferences:
-            - DataSetPlaceholder: 'vpc_flow_logs_view'
-              DataSetArn: !GetAtt 'VpcFlowLogsAthenaDataset.Arn'
-          Arn: 'arn:aws:quicksight:us-east-1:869004330191:template/vpc-flow-logs-analysis-enhanced-template-v6'
-      VersionDescription: 'VPC Flow Logs Dashboard reInvent 2021- v6'
-Outputs:
-  StackName:
-    Description: 'Stack name'
-    Value: !Sub '${AWS::StackName}'
\ No newline at end of file
diff --git a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_api_template.yml b/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_api_template.yml
deleted file mode 100644
index 1673663d7..000000000
--- a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_api_template.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform: AWS::Serverless-2016-10-31
-Parameters:
-  CognitoUserPoolArn:
-    Type: String
-  AppUrl:
-    Type: String
-
-Resources:
-  AppTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      TableName: Rides
-      AttributeDefinitions:
-        -
-          AttributeName: "RideId"
-          AttributeType: "S"
-      KeySchema:
-        -
-          AttributeName: "RideId"
-          KeyType: "HASH"
-      ProvisionedThroughput:
-        ReadCapacityUnits: 5
-        WriteCapacityUnits: 5
-
-  AppLambdaExecutionRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - sts:AssumeRole
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      Policies:
-        - PolicyName: DynamoDBWriteAccess
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: 'dynamodb:PutItem'
-                Resource: !GetAtt AppTable.Arn
-        - PolicyName: XRayWriteAccess
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: 
-                  - 'xray:PutTraceSegments'
-                  - 'xray:PutTelemetryRecords'
-                Resource: "*"
-
-  AppLambda:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs12.x
-      Role: !GetAtt AppLambdaExecutionRole.Arn
-      Handler: index.handler
-      Tracing: Active
-      Layers:
-        - !Ref XraySdk
-      CodeUri: ./lambda/app
-      Description: Backend API
-      Environment:
-        Variables:
-          APP_URL: !Ref AppUrl
-
-  XraySdk:
-    Type: AWS::Serverless::LayerVersion
-    Properties:
-      LayerName: XraySdk
-      Description: XraySdk
-      ContentUri: ./layers/xray-sdk
-      CompatibleRuntimes:
-        - nodejs12.x
-
-  ApplambdaApiGatewayInvoke:
-    Type: AWS::Lambda::Permission
-    Properties:
-      Action: lambda:InvokeFunction
-      FunctionName: !GetAtt AppLambda.Arn
-      Principal: apigateway.amazonaws.com
-      SourceArn: !Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${AppRestApi}/*/POST/ride
-
-  AppRestApi:
-    Type: AWS::ApiGateway::RestApi
-    Properties:
-      EndpointConfiguration:
-        Types:
-          - REGIONAL
-      Name: "BlueCarHealth"
-
-  AppRestApiAuthorizer:
-    Type: 'AWS::ApiGateway::Authorizer'
-    Properties:
-      Type: COGNITO_USER_POOLS
-      ProviderARNs: [ !Ref CognitoUserPoolArn ]
-      IdentitySource: method.request.header.Authorization
-      Name: "BlueCarHealth"
-      RestApiId: !Ref AppRestApi
-
-  AppRestApiRideResource:
-    Type: 'AWS::ApiGateway::Resource'
-    Properties:
-      RestApiId: !Ref AppRestApi
-      ParentId: !GetAtt
-        - AppRestApi
-        - RootResourceId
-      PathPart: ride
-
-  AppRestApiRidePostMethod:
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      RestApiId: !Ref AppRestApi
-      ResourceId: !Ref AppRestApiRideResource
-      HttpMethod: POST
-      AuthorizationType: COGNITO_USER_POOLS
-      AuthorizerId: !Ref AppRestApiAuthorizer
-      Integration:
-        Type: AWS_PROXY
-        IntegrationHttpMethod: POST
-        Uri: !Sub >-
-          arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${AppLambda.Arn}/invocations
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'"
-              method.response.header.Access-Control-Allow-Origin:  !Sub 
-                                                                    - "'${ORIGIN}'"
-                                                                    - ORIGIN: !Ref AppUrl
-              method.response.header.Access-Control-Allow-Methods: "'OPTIONS,GET,PUT,POST,DELETE,PATCH,HEAD'"
-            StatusCode: '204'
-        RequestTemplates:
-          application/json: '{ statusCode: 200 }'
-      MethodResponses:
-        - ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Origin: true
-            method.response.header.Access-Control-Allow-Methods: true
-          StatusCode: '204'
-          ResponseModels:
-            application/json: Empty
-
-  #Added OPTIONS method that can respond to the OPTIONS preflight request
-  AppRestApiOPTIONSMethod:
-    Type: 'AWS::ApiGateway::Method'
-    Properties:
-      RestApiId: !Ref AppRestApi
-      ResourceId: !Ref AppRestApiRideResource
-      HttpMethod: OPTIONS #added
-      AuthorizationType: NONE
-      Integration:
-        IntegrationResponses:
-          - ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'"
-              method.response.header.Access-Control-Allow-Origin:  !Sub 
-                                                                    - "'${ORIGIN}'"
-                                                                    - ORIGIN: !Ref AppUrl
-              method.response.header.Access-Control-Allow-Methods: "'OPTIONS,GET,PUT,POST,DELETE,PATCH,HEAD'"
-            StatusCode: '204'
-        RequestTemplates:
-          application/json: '{ statusCode: 200 }'
-        Type: MOCK
-      MethodResponses:
-        - ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: true
-            method.response.header.Access-Control-Allow-Origin: true
-            method.response.header.Access-Control-Allow-Methods: true
-          StatusCode: '204'
-
-  AppRestApiDeployment:
-    Type: AWS::ApiGateway::Deployment
-    DependsOn:
-      - AppRestApiRidePostMethod
-      - AppRestApiOPTIONSMethod
-    Properties:
-      RestApiId: !Ref AppRestApi
-      StageName: prod
-
-Outputs:
-  ApiEndpoint:
-    Value: !Sub 'https://${AppRestApi}.execute-api.${AWS::Region}.amazonaws.com/prod'
-
diff --git a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_template.yml b/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_template.yml
deleted file mode 100644
index 91cbfd0af..000000000
--- a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/amplify_template.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-
-Resources:
-  AmplifyRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - amplify.amazonaws.com
-            Action:
-              - sts:AssumeRole
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/AWSCodeCommitReadOnly
-      Policies:
-        - PolicyName: cognito
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: 
-                - 'cognito-identity:CreateIdentityPool'
-                - 'cognito-identity:SetIdentityPoolRoles'
-                - 'cognito-idp:CreateUserPool'
-                - 'cognito-identity:DescribeIdentityPool'
-                - 'cognito-idp:CreateUserPoolClient'
-                - 'cognito-idp:DeleteUserPoolClient'
-                - 'cognito-idp:DeleteUserPool'
-                Resource: "*"
-        - PolicyName: amplify
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: 
-                - 'amplify:ListApps'
-                - 'amplify:CreateBackendEnvironment'
-                - 'amplify:GetApp'
-                - 'amplify:GetBackendEnvironment'
-                - 'amplify:UpdateBranch'
-                Resource: "*"
-        - PolicyName: iam
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action: 
-                - 'iam:CreateRole'
-                - 'iam:GetRole'
-                - 'iam:GetRolePolicy'
-                - 'iam:PutRolePolicy'
-                - 'iam:PassRole'
-                - 'iam:DeleteRolePolicy'
-                - 'iam:DeleteRole'
-                Resource: "*"
-        - PolicyName: kms
-          PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 
-                  - 'kms:Decrypt'
-                  Resource: "*"
-        - PolicyName: lambda
-          PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 
-                  - 'lambda:CreateFunction'
-                  - 'lambda:GetFunction'
-                  - 'lambda:GetFunctionCodeSigningConfig'
-                  - 'lambda:InvokeFunction'
-                  - 'lambda:DeleteFunction'
-                  Resource: "*"
-        - PolicyName: AmplifyStorageSDKCalls
-          PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 
-                  - 's3:CreateBucket'
-                  - 's3:DeleteBucket'
-                  - 's3:DeleteBucketPolicy'
-                  - 's3:DeleteBucketWebsite'
-                  - 's3:DeleteObject'
-                  - 's3:DeleteObjectVersion'
-                  - 's3:GetBucketLocation'
-                  - 's3:GetObject'
-                  - 's3:ListAllMyBuckets'
-                  - 's3:ListBucket'
-                  - 's3:ListBucketVersions'
-                  - 's3:PutBucketAcl'
-                  - 's3:PutBucketCORS'
-                  - 's3:PutBucketNotification'
-                  - 's3:PutBucketPolicy'
-                  - 's3:PutBucketVersioning'
-                  - 's3:PutBucketWebsite'
-                  - 's3:PutEncryptionConfiguration'
-                  - 's3:PutLifecycleConfiguration'
-                  - 's3:PutObject'
-                  - 's3:PutObjectAcl'
-                  Resource: "*"
-        - PolicyName: ssm
-          PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 
-                  - 'ssm:GetParametersByPath'
-                  Resource: "*"
-        - PolicyName: cloudformation
-          PolicyDocument:
-              Version: "2012-10-17"
-              Statement:
-                - Effect: Allow
-                  Action: 
-                  - 'cloudformation:DescribeStackResources'
-                  - 'cloudformation:DescribeStackResource'
-                  - 'cloudformation:DescribeStackEvents'
-                  - 'cloudformation:DescribeStacks'
-                  - 'cloudformation:CreateStack'
-                  - 'cloudformation:UpdateStack'
-                  - 'cloudformation:ListStackResources'
-                  Resource: "*"
-  AmplifyApp:
-    Type: "AWS::Amplify::App"
-    Properties:
-      Name: oncall-health
-      Repository: 
-        Fn::ImportValue:
-          !Sub "oncall-health-repo-CloneUrlHttp"
-      Description: Oncall Health Vue App
-      EnvironmentVariables:
-        - Name: "_LIVE_UPDATES" 
-          Value: "[{\"name\":\"Amplify CLI\",\"pkg\":\"@aws-amplify/cli\",\"type\":\"npm\",\"version\":\"latest\"}]"
-      CustomRules:
-        - Status: "404-200"
-          Source: "/<*>"
-          Target: "/index.html"
-        - Status: "200"
-          Source: "</^[^.]+$|\\.(?!(css|gif|ico|jpg|js|png|txt|svg|woff|ttf|map|json)$)([^.]+$)/>"
-          Target: "/index.html"
-      BuildSpec: |-
-        version: 1
-        backend:
-          phases:
-            build:
-              commands:
-                - '# Execute Amplify CLI with the helper script'
-                - amplifyPush --simple
-        frontend:
-          phases:
-            preBuild:
-              commands:
-                - npm install
-            build:
-              commands:
-                - npm run build
-          artifacts:
-            baseDirectory: dist
-            files:
-              - '**/*'
-          cache:
-            paths:
-              - node_modules/**/*
-      IAMServiceRole: !GetAtt AmplifyRole.Arn
-
-  AmplifyBranch:
-    Type: AWS::Amplify::Branch
-    Properties:
-      BranchName: master
-      AppId: !GetAtt AmplifyApp.AppId
-      Description: Master Branch
-      EnableAutoBuild: true
-      EnvironmentVariables:
-        - Name: USER_BRANCH
-          Value: prod
-      Stage: PRODUCTION
-
-        
-Outputs:
-  OutputAppId:
-    Value: !GetAtt AmplifyApp.AppId
-  AppURL:
-      Description: oncall-health-sample-app URL
-      Value: !Sub
-        - "https://master.${AppId}.amplifyapp.com"
-        - AppId: !GetAtt AmplifyApp.AppId
\ No newline at end of file
diff --git a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/artillery_load_test/test.yaml b/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/artillery_load_test/test.yaml
deleted file mode 100644
index ab27b9f2c..000000000
--- a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/artillery_load_test/test.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-config:
-  target: '<Your API Invoke URL>'
-  phases:
-    - duration: 10
-      arrivalRate: 200
-  processor: "./loadTestFunction.js"
-  defaults:
-    headers:
-      Authorization: 'Bearer <Your Auth Token>'
-scenarios:
-  - flow:
-    - function: "generateRandomData"
-    - post:
-        url: "/ride"
-        json:
-          PickupLocation:
-            Latitude: {{ lat }}
-            Longitude: {{ lng }}
diff --git a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/repo_template.yml b/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/repo_template.yml
deleted file mode 100644
index 52de6e9a1..000000000
--- a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/oncall-health-sample-app/repo_template.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-
-Resources:
-  Repository:
-    Type: AWS::CodeCommit::Repository
-    Properties: 
-      RepositoryDescription: Oncall Health Repo
-      RepositoryName: oncall-health
-
-Outputs:
-  OutputRepository:
-    Value: !GetAtt Repository.CloneUrlHttp
-    Export: 
-      Name: !Sub oncall-health-repo-CloneUrlHttp
\ No newline at end of file
diff --git a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/templates/section1/section1-oncall-health-sample-app.yaml b/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/templates/section1/section1-oncall-health-sample-app.yaml
deleted file mode 100644
index c10fd6e4a..000000000
--- a/static/wapartners/100_Automating_Serverless_Best_Practices_with_Dashbird/Code/templates/section1/section1-oncall-health-sample-app.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: oncall-health-sample-app
-
-Resources:
-  #Cloud9 to provide IDE
-  Cloud9:
-    Type: 'AWS::Cloud9::EnvironmentEC2'
-    Properties:
-      Name: !Sub '${AWS::StackName}-Cloud9-IDE'
-      Description: 'Cloud9 Environment for WA Lab'
-      AutomaticStopTimeMinutes: 30
-      InstanceType: 't3.small'
-      Repositories:
-        - PathComponent: /aws-well-architected-labs
-          RepositoryUrl: 'https://github.com/awslabs/aws-well-architected-labs.git'
-
-Outputs:
-  Cloud9URL:
-    Description: Cloud9 Environment
-    Value:
-      Fn::Join:
-      - ''
-      - - !Sub https://${AWS::Region}.console.aws.amazon.com/cloud9/ide/
-        - !Ref 'Cloud9'
diff --git a/static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/integration/template.yaml b/static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/integration/template.yaml
deleted file mode 100644
index 5dbb9aa77..000000000
--- a/static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/integration/template.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: >
-  AWS Well-Architected Tool Integration with AWS Compute Optimizer and AWS Trusted Advisor
-Resources:
-##########################################################################
-#   API Gateway                                                 #
-##########################################################################
-  ApiGatewayApi:
-    Type: AWS::Serverless::Api
-    Properties:
-      StageName: Prod
-      EndpointConfiguration:
-        Type: REGIONAL
-##########################################################################
-#   Lambda Function                                                      #
-##########################################################################
-  WAIntegrations:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: src/
-      Handler: app.handler
-      Runtime: nodejs14.x
-      Timeout: 10
-      Environment:
-        Variables:
-          DatabaseTable: !Ref MapEngineTable
-      Policies:
-        ## Read more about SAM Policy templates at:
-        ## https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-policy-templates.html
-        - DynamoDBReadPolicy:
-            TableName: !Ref MapEngineTable
-        - EC2DescribePolicy: {}
-        - Version: "2012-10-17"
-          Statement:
-            - Sid: ComputeOptimizer
-              Effect: Allow
-              Action:
-                - 'compute-optimizer:GetEC2InstanceRecommendations'
-              Resource:
-                - '*'
-            - Sid: TrustedAdvisor
-              Effect: Allow
-              Action:
-                - 'support:DescribeTrustedAdvisorChecks'
-                - 'support:DescribeTrustedAdvisorCheckResult'
-              Resource:
-                - '*'
-            - Sid: WellArchitected
-              Effect: Allow
-              Action:
-                - 'wellarchitected:GetWorkload'
-                - 'wellarchitected:GetAnswer'
-                - 'wellarchitected:UpdateAnswer'
-                - 'wellarchitected:UpdateWorkload'
-                - 'wellarchitected:TagResource'
-                - 'wellarchitected:CreateMilestone'
-              Resource:
-                - '*'
-# update dynamodb
-  LambdaPutDynamoDB:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: src/dynamodb
-      Handler: mappingEngine.handler
-      Runtime: nodejs14.x
-      Timeout: 3
-      Environment:
-        Variables:
-          DatabaseTable: !Ref MapEngineTable
-      Policies:
-        - DynamoDBWritePolicy:
-            TableName: !Ref MapEngineTable
-      Events:
-        HttpPost:
-          Type: Api
-          Properties:
-            Path: /
-            Method: POST
-            RestApiId:
-              Ref: ApiGatewayApi
-##########################################################################
-#   Amazon EventBridge Rule                                                            #
-##########################################################################       
-  WAEventRule:
-    Type: AWS::Events::Rule
-    Properties:
-      Description: Well-Architected Events Rule
-      EventPattern: 
-        source:
-        - aws.wellarchitected
-        detail:
-          eventName: 
-            - CreateWorkload
-      Name: WAEventRule
-      State: ENABLED
-      Targets:
-      - 
-        Arn: 
-          Fn::GetAtt:
-            - WAIntegrations
-            - Arn
-        Id: WAEventRulev1
-
-  PermissionForEventsToInvokeLambda: 
-    Type: AWS::Lambda::Permission
-    Properties: 
-      FunctionName: !Ref WAIntegrations
-      Action: lambda:InvokeFunction
-      Principal: events.amazonaws.com
-      SourceArn: 
-        Fn::GetAtt: 
-          - WAEventRule
-          - Arn
-##########################################################################
-#   DynamoDB                                                            #
-##########################################################################
-  MapEngineTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      TableName: wa-mapping
-      AttributeDefinitions:
-      - AttributeName: PillarNumber
-        AttributeType: S
-      KeySchema:
-      - AttributeName: PillarNumber
-        KeyType: HASH
-      BillingMode: PAY_PER_REQUEST
-##########################################################################
-#   OUTPUTS                                                              #
-##########################################################################
-  
-Outputs:
-  WAIntegrations:
-    Value: !Ref WAIntegrations
-    Description: WAIntegrations function Arn
-  
-  LambdaPutDynamoDB:
-    Value: !Ref LambdaPutDynamoDB
-    Description: LambdaPutDynamoDB function  Arn
-
-  DynamoDbTable:
-    Value: !Ref MapEngineTable
-    Description: DynamoDb Table 
-  
-  APIGWUrl:
-    Value:
-      Fn::Sub:
-      - https://${ServerlessRestApi}.execute-api.${Region}.amazonaws.com/Prod
-      - Region: !Ref AWS::Region
-        ServerlessRestApi: !Ref ApiGatewayApi
-    Description: Use this url to put items into MapEngineTable
\ No newline at end of file
diff --git a/static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/templates/section1/section1-base.yaml b/static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/templates/section1/section1-base.yaml
deleted file mode 100644
index 0d474bd5c..000000000
--- a/static/watool/200_Integration_with_AWS_Compute_Optimizer_and_AWS_Trusted_Advisor/Code/templates/section1/section1-base.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: AWS Well-Architected Tool Integration with AWS Compute Optimizer and AWS Trusted Advisor
-
-Resources:
-  #Cloud9 to provide IDE
-  Cloud9:
-    Type: 'AWS::Cloud9::EnvironmentEC2'
-    Properties:
-      Name: !Sub '${AWS::StackName}-Cloud9-IDE'
-      Description: 'Cloud9 Environment for WA Lab'
-      AutomaticStopTimeMinutes: 30
-      InstanceType: 't2.micro'
-      Repositories:
-        - PathComponent: /aws-well-architected-labs
-          RepositoryUrl: 'https://github.com/awslabs/aws-well-architected-labs.git'
-
-Outputs:
-  Cloud9URL:
-    Description: Cloud9 EnvironmentSp
-    Value:
-      Fn::Join:
-      - ''
-      - - !Sub https://${AWS::Region}.console.aws.amazon.com/cloud9/ide/
-        - !Ref 'Cloud9'
diff --git a/static/watool/200_Manage_Workload_Risks_with_OpsCenter/Code/risk_management.yaml b/static/watool/200_Manage_Workload_Risks_with_OpsCenter/Code/risk_management.yaml
deleted file mode 100644
index 5aa7a7f81..000000000
--- a/static/watool/200_Manage_Workload_Risks_with_OpsCenter/Code/risk_management.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
----
-AWSTemplateFormatVersion: 2010-09-09
-Description: >-
-  AWS CloudFormation Sample Template to create lab resources. Creates a DynamoDB
-  table, SNS Topic, SNS Topic Policy, IAM role, and CloudWatch LogGroups.
-
-  **WARNING** You will be billed for the AWS resources created if you create a
-  stack from this template.
-
-  Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License"). You may not
-  use this file except in compliance with the License. A copy of the License is
-  located at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  or in the "license" file accompanying this file. This file is distributed  on
-  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-  or implied. See the License for the specific language governing permissions
-  and limitations under the License.
-Resources:
-  RiskTrackingLambdaLogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: /aws/lambda/wa-risk-tracking
-  UpdateWorkloadLambdaLogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: /aws/lambda/wa-update-workload
-  LambdaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: wa-risk-tracking-lambda-role
-      ManagedPolicyArns:
-          - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-            Action:
-              - 'sts:AssumeRole'
-      Policies:
-        - PolicyName: wa-risk-tracking-lambda-policy
-          PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Sid: VisualEditor0
-                Effect: Allow
-                Action:
-                  - 'dynamodb:PutItem'
-                  - 'dynamodb:DeleteItem'
-                  - 'dynamodb:GetItem'
-                Resource: !GetAtt
-                  - DynamoDBTable
-                  - Arn
-              - Sid: VisualEditor1
-                Effect: Allow
-                Action:
-                  - 'wellarchitected:ListWorkloads'
-                  - 'wellarchitected:GetAnswer'
-                  - 'wellarchitected:GetWorkload'
-                  - 'wellarchitected:ListLensReviewImprovements'
-                  - 'ssm:GetOpsItem'
-                  - 'wellarchitected:UpdateAnswer'
-                  - 'ssm:CreateOpsItem'
-                Resource: '*'
-  DynamoDBTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      AttributeDefinitions:
-        - AttributeName: workload_id
-          AttributeType: S
-        - AttributeName: question_id
-          AttributeType: S
-      TableName: wa_workload_data
-      KeySchema:
-        - AttributeName: workload_id
-          KeyType: HASH
-        - AttributeName: question_id
-          KeyType: RANGE
-      ProvisionedThroughput:
-        ReadCapacityUnits: 5
-        WriteCapacityUnits: 5
-  SNSTopic:
-    Type: AWS::SNS::Topic
-    Properties:
-      TopicName: wa-risk-tracking
-  SNSTopicPolicy:
-    Type: AWS::SNS::TopicPolicy
-    Properties:
-      Topics:
-        - !Ref SNSTopic
-      PolicyDocument:
-        Version: 2012-10-17
-        Id: __default_policy_ID
-        Statement:
-          - Sid: Allow OpsCenter to publish to this topic
-            Effect: Allow
-            Principal:
-              Service: ssm.amazonaws.com
-            Action: 'SNS:Publish'
-            Resource: !Ref SNSTopic
-Outputs:
-  SNSTopicArn:
-    Description: The ARN of the SNS Topic
-    Value: !Ref SNSTopic
\ No newline at end of file
diff --git a/static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/DeployWACustomLambda.yaml b/static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/DeployWACustomLambda.yaml
deleted file mode 100644
index 0951b1588..000000000
--- a/static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/DeployWACustomLambda.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: This template creates an EC2 instance with tagging and then creates
-  a Well-Architected workload review and pre-fills in some responses.
-  (c) 2021 Amazon Web Services, Inc. or its affiliates. All Rights Reserved. This
-  AWS Content is provided subject to the terms of the AWS Customer Agreement available
-  at http://aws.amazon.com/agreement or other written agreement between Customer and
-  Amazon Web Services, Inc.
-Transform: AWS::Serverless-2016-10-31
-
-
-Parameters:
-  CreateWALambdaFunctionName:
-    Type: String
-    AllowedPattern: "[a-zA-Z0-9]+[a-zA-Z0-9-]+[a-zA-Z0-9]+"
-    Default: CreateNewWAFRFunction
-  UpdateWAQLambdaFunctionName:
-    Type: String
-    AllowedPattern: "[a-zA-Z0-9]+[a-zA-Z0-9-]+[a-zA-Z0-9]+"
-    Default: UpdateWAQFunction
-
-  LambdaFunctionsBucket:
-    Description: "Bucket that the lambda source is contained in (case sensitive)"
-    Default: "aws-well-architected-labs-ohio"
-    # Default: "aws-well-architected-labs-virginia"
-    Type: String
-  WAToolCFNAPIKey:
-    Description: "Object Key of the Lambda Function that will create the WA review"
-    Default: "watool/WAToolCFNAPILambda.zip"
-    Type: String
-
-Resources:
-  awslambdapowertoolspythonlayer:
-    Type: AWS::Serverless::Application
-    Properties:
-      Location:
-        ApplicationId: arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer
-        SemanticVersion: 1.11.0
-
-  CreateWAlambdaIAMRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-      Policies:
-        - PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Action:
-                  - logs:CreateLogGroup
-                  - logs:CreateLogStream
-                  - logs:PutLogEvents
-                Effect: Allow
-                Resource:
-                  - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${CreateWALambdaFunctionName}:*
-          PolicyName: lambda
-        - PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Action:
-                  - wellarchitected:CreateWorkload
-                  - wellarchitected:GetWorkload
-                  - wellarchitected:List*
-                  - wellarchitected:TagResource
-                  - wellarchitected:UntagResource
-                  - wellarchitected:UpdateWorkload
-                Effect: Allow
-                Resource: '*'
-          PolicyName: watool
-
-
-  CreateWAFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Code:
-        S3Bucket: !Ref LambdaFunctionsBucket
-        S3Key: !Ref WAToolCFNAPIKey
-      Description: "Lambda function to create or updated a WA review for a CloudFormation custom handler"
-      FunctionName: !Ref CreateWALambdaFunctionName
-      Handler: CreateWAWorkloadLambda.lambda_handler
-      Layers:
-        - !GetAtt awslambdapowertoolspythonlayer.Outputs.LayerVersionArn
-      MemorySize: 128
-      Timeout: 15
-      Role: !GetAtt CreateWAlambdaIAMRole.Arn
-      Runtime: python3.8
-
-  CreateWAlambdaLogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: !Sub /aws/lambda/${CreateWALambdaFunctionName}
-      RetentionInDays: 90
-
-  UpdateWAQlambdaIAMRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-      Policies:
-        - PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Action:
-                  - logs:CreateLogGroup
-                  - logs:CreateLogStream
-                  - logs:PutLogEvents
-                Effect: Allow
-                Resource:
-                  - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${UpdateWAQLambdaFunctionName}:*
-          PolicyName: lambda
-        - PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Action:
-                  - wellarchitected:GetAnswer
-                  - wellarchitected:GetWorkload
-                  - wellarchitected:List*
-                  - wellarchitected:TagResource
-                  - wellarchitected:UntagResource
-                  - wellarchitected:UpdateAnswer
-                Effect: Allow
-                Resource: '*'
-          PolicyName: watool
-
-  UpdateWAQFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Code:
-        S3Bucket: !Ref LambdaFunctionsBucket
-        S3Key: !Ref WAToolCFNAPIKey
-      Description: "Lambda function to answer questions in a pillar of a WA review for a CloudFormation custom handler"
-      FunctionName: !Ref UpdateWAQLambdaFunctionName
-      Handler: UpdateWAQuestionLambda.lambda_handler
-      Layers:
-        - !GetAtt awslambdapowertoolspythonlayer.Outputs.LayerVersionArn
-      MemorySize: 128
-      Timeout: 15
-      Role: !GetAtt UpdateWAQlambdaIAMRole.Arn
-      Runtime: python3.8
-
-  UpdateWAQlambdaLogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: !Sub /aws/lambda/${UpdateWAQLambdaFunctionName}
-      RetentionInDays: 90
-
-Outputs:
-  CreateWAlambdaArn:
-    Value: !GetAtt CreateWAFunction.Arn
-    Export:
-      Name: !Sub '${AWS::StackName}::CreateWAARN'
-  UpdateWAQlambdaArn:
-    Value: !GetAtt UpdateWAQFunction.Arn
-    Export:
-      Name: !Sub '${AWS::StackName}::UpdateWAQARN'
-  LambdaPowertoolsPythonLayerARN:
-    Value: !GetAtt awslambdapowertoolspythonlayer.Outputs.LayerVersionArn
-    Export:
-      Name: !Sub '${AWS::StackName}::LambdaPowertoolsPythonLayerARN'
diff --git a/static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/SampleLambdaAPIGWDeploy.yaml b/static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/SampleLambdaAPIGWDeploy.yaml
deleted file mode 100644
index 709793fd9..000000000
--- a/static/watool/300_Using_WAT_With_Cloudformation_And_Custom_Lambda/Code/CFN/SampleLambdaAPIGWDeploy.yaml
+++ /dev/null
@@ -1,281 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Description: This template creates an Lambda/APIGW simple app with tagging
-  and then creates a Well-Architected workload review and pre-fills in some responses.
-  (c) 2021 Amazon Web Services, Inc. or its affiliates. All Rights Reserved. This
-  AWS Content is provided subject to the terms of the AWS Customer Agreement available
-  at http://aws.amazon.com/agreement or other written agreement between Customer and
-  Amazon Web Services, Inc.
-# Transform: AWS::Serverless-2016-10-31
-
-
-Parameters:
-  # Name of the CFN Stack that was deployed with the Well-Architected Lambda Handlers
-  LambdaStackName:
-    Description: Name of the Role Stack to reference outputs
-    Type: String
-    Default: WALambdaHelpers
-
-  # Well-Architected Variables
-  WAWorkloadType:
-    # This is just an example of how you could organize the tags and make it easier
-    #  to reference the Well-Architected Workload against the actual application
-    #  for reporting.
-    Description: Example list of Workload types that could be used in your environment
-    Type: String
-    Default: "APIGWLambda"
-    AllowedValues:
-      - APIGWLambda
-      - EC2WebApp
-      - EKSWebApp
-      - ECSWebApp
-  WAWorkloadDescription:
-    Description: Description for WA Workload field
-    Type: String
-    Default: "Test Lambda WA Workload"
-  WAWorkloadOwner:
-    Description: Who owns the WA workload
-    Type: String
-    Default: "ExampleCorp AI Team"
-  WAEnvironment:
-    Description: The environment in which your workload runs.
-    Type: String
-    Default: "PRODUCTION"
-    AllowedValues:
-      - PRODUCTION
-      - PREPRODUCTION
-    ConstraintDescription: "This must either be PRODUCTION or PREPRODUCTION"
-
-  # Super Simple Lambda/API variables
-  APIGWName:
-    Type: String
-    Default: walabs-api
-  apiGatewayStageName:
-    Type: String
-    AllowedPattern: "[a-z0-9]+"
-    Default: production
-  APIGWHTTPMethod:
-    Type: String
-    Default: GET
-  SampleLambdaFunctionName:
-    Type: String
-    AllowedPattern: "[a-zA-Z0-9]+[a-zA-Z0-9-]+[a-zA-Z0-9]+"
-    Default: WALabsSampleLambdaFunction
-
-
-Resources:
-  CreateWAWorkload:
-    Type: Custom::createWAWorkloadHelperFunction
-    Properties:
-      ServiceToken:
-        Fn::ImportValue:
-          !Sub "${LambdaStackName}::CreateWAARN"
-      WorkloadName: !Sub "${WAWorkloadType} - ${APIGWName} - ${SampleLambdaFunctionName}"
-      WorkloadDesc: !Sub "${WAWorkloadDescription} for ${WAWorkloadType} - ${APIGWName} - ${SampleLambdaFunctionName}"
-      WorkloadOwner: !Ref WAWorkloadOwner
-      WorkloadEnv: !Ref WAEnvironment
-      WorkloadRegion: !Ref AWS::Region
-      WorkloadLenses:
-        - "wellarchitected"
-        - "serverless"
-      Tags:
-        WorkloadType: !Ref WAWorkloadType
-        APIGWName: !Ref APIGWName
-        WorkloadName: !Sub "${APIGWName}::${SampleLambdaFunctionName}"
-
-
-  OEWAWorkloadQuestions:
-    # DependsOn: CreateWAWorkload
-    Type: Custom::AnswerOEWAWorkloadQuestionsHelperFunction
-    Properties:
-      ServiceToken:
-        Fn::ImportValue:
-          !Sub "${LambdaStackName}::UpdateWAQARN"
-      Pillar: "operationalExcellence"
-      Lens: "wellarchitected"
-      WorkloadId: !GetAtt CreateWAWorkload.WorkloadId
-      QuestionAnswers:
-        - "How do you determine what your priorities are": # OPS1
-          - "Evaluate governance requirements"
-          - "Evaluate compliance requirements"
-        - "How do you reduce defects, ease remediation, and improve flow into production": #OPS5
-          - "Use version control"
-          - "Perform patch management"
-          - "Use multiple environments"
-
-  SECWAWorkloadQuestions:
-    # DependsOn: CreateWAWorkload
-    Type: Custom::AnswerSECWAWorkloadQuestionsHelperFunction
-    Properties:
-      ServiceToken:
-        Fn::ImportValue:
-          !Sub "${LambdaStackName}::UpdateWAQARN"
-      Pillar: "security"
-      Lens: "wellarchitected"
-      WorkloadId: !GetAtt CreateWAWorkload.WorkloadId
-      QuestionAnswers:
-        - "How do you securely operate your workload": # SEC1
-          - "Separate workloads using accounts"
-          - "Secure AWS account"
-          - "Keep up to date with security threats"
-
-  RELWAWorkloadQuestions:
-    # DependsOn: CreateWAWorkload
-    Type: Custom::AnswerRELWAWorkloadQuestionsHelperFunction
-    Properties:
-      ServiceToken:
-        Fn::ImportValue:
-          !Sub "${LambdaStackName}::UpdateWAQARN"
-      Pillar: "reliability"
-      Lens: "wellarchitected"
-      WorkloadId: !GetAtt CreateWAWorkload.WorkloadId
-      QuestionAnswers:
-        - "How do you plan your network topology": # REL2
-          - "Use highly available network connectivity for your workload public endpoints"
-          - "Provision redundant connectivity between private networks in the cloud and on-premises environments"
-          - "Ensure IP subnet allocation accounts for expansion and availability"
-          - "Prefer hub-and-spoke topologies over many-to-many mesh"
-          - "Enforce non-overlapping private IP address ranges in all private address spaces where they are connected"
-
-  apiGateway:
-    Type: AWS::ApiGateway::RestApi
-    Properties:
-      Description: Example API Gateway
-      EndpointConfiguration:
-        Types:
-          - REGIONAL
-      Name: !Ref APIGWName
-      Tags:
-        - Key: WorkloadType
-          Value: !Ref WAWorkloadType
-        - Key: APIGWName
-          Value: !Ref APIGWName
-        - Key: WorkloadName
-          Value: !Sub "${APIGWName}::${SampleLambdaFunctionName}"
-
-  apiGatewayRootMethod:
-    Type: AWS::ApiGateway::Method
-    Properties:
-      AuthorizationType: NONE
-      HttpMethod: !Ref APIGWHTTPMethod
-      Integration:
-        IntegrationHttpMethod: POST
-        Type: AWS_PROXY
-        Uri: !Sub
-          - arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${lambdaArn}/invocations
-          - lambdaArn: !GetAtt lambdaFunction.Arn
-      ResourceId: !GetAtt apiGateway.RootResourceId
-      RestApiId: !Ref apiGateway
-
-  apiGatewayDeployment:
-    Type: AWS::ApiGateway::Deployment
-    DependsOn:
-      - apiGatewayRootMethod
-    Properties:
-      RestApiId: !Ref apiGateway
-      StageName: !Ref apiGatewayStageName
-
-  lambdaFunction:
-    Type: AWS::Lambda::Function
-    Properties:
-      Code:
-        ZipFile: |
-          import json
-          def handler(event,context):
-            print(json.dumps(event))
-            body = '<html><head></head> '
-            body += "<h1> Hello {0}".format(event['requestContext']['identity']['sourceIp']) + "</h1><br>"
-            body += 'Welcome to <a href="https://wellarchitectedlabs.com">Well-Architected Labs</a>!'
-            body += '</html>'
-            return {
-              'body': body,
-              'headers': {
-                'Content-Type': 'text/html'
-              },
-              'statusCode': 200
-            }
-      Description: Example Lambda function that will return the callers IP address and welcome them.
-      FunctionName: !Ref SampleLambdaFunctionName
-      Handler: index.handler
-      MemorySize: 128
-      Role: !GetAtt lambdaIAMRole.Arn
-      Runtime: python3.8
-      Tags:
-        - Key: WorkloadType
-          Value: !Ref WAWorkloadType
-        - Key: APIGWName
-          Value: !Ref APIGWName
-        - Key: WorkloadName
-          Value: !Sub "${APIGWName}::${SampleLambdaFunctionName}"
-
-  lambdaApiGatewayInvoke:
-    Type: AWS::Lambda::Permission
-    Properties:
-      Action: lambda:InvokeFunction
-      FunctionName: !GetAtt lambdaFunction.Arn
-      Principal: apigateway.amazonaws.com
-      SourceArn: !Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${apiGateway}/${apiGatewayStageName}/${APIGWHTTPMethod}/
-
-  lambdaIAMRole:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Version: 2012-10-17
-        Statement:
-          - Action:
-              - sts:AssumeRole
-            Effect: Allow
-            Principal:
-              Service:
-                - lambda.amazonaws.com
-      Policies:
-        - PolicyDocument:
-            Version: 2012-10-17
-            Statement:
-              - Action:
-                  - logs:CreateLogGroup
-                  - logs:CreateLogStream
-                  - logs:PutLogEvents
-                Effect: Allow
-                Resource:
-                  - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${SampleLambdaFunctionName}:*
-          PolicyName: lambda
-      Tags:
-        - Key: WorkloadType
-          Value: !Ref WAWorkloadType
-        - Key: APIGWName
-          Value: !Ref APIGWName
-        - Key: WorkloadName
-          Value: !Sub "${APIGWName}::${SampleLambdaFunctionName}"
-
-  lambdaLogGroup:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: !Sub /aws/lambda/${SampleLambdaFunctionName}
-      RetentionInDays: 90
-
-
-Outputs:
-  WAWorkloadArn:
-    Description: WorkloadArn
-    Value: !GetAtt CreateWAWorkload.WorkloadARN
-
-  WAWorkloadId:
-    Description: WorkloadId
-    Value: !GetAtt CreateWAWorkload.WorkloadId
-
-  apiGatewayInvokeURL:
-    Value: !Sub https://${apiGateway}.execute-api.${AWS::Region}.amazonaws.com/${apiGatewayStageName}
-
-  lambdaArn:
-    Value: !GetAtt lambdaFunction.Arn
-      # WorkloadName: "Lambda WA Workload Test"
-      # WorkloadDesc: "Test Lambda WA Workload"
-      # WorkloadOwner: "Lambda Script"
-      # WorkloadEnv: "PRODUCTION"
-      # WorkloadRegion: "us-east-1"
-      # WorkloadLenses:
-      #   - "wellarchitected"
-      #   - "serverless"
-      # Tags:
-      #   TestTag: "TestTagValue"
-      #   TestTag3: "TestTagValue3"

From 067bcea7ac09e1c5bc8c1951d61c511a578c920c Mon Sep 17 00:00:00 2001
From: Ibrahim Cesar <ibracnb@amazon.com>
Date: Tue, 9 Sep 2025 13:17:04 -0300
Subject: [PATCH 4/4] feat: add code snippet for CloudWatch RUM client

---
 .../learn/layouts/partials/custom-footer.html  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/themes/learn/layouts/partials/custom-footer.html b/themes/learn/layouts/partials/custom-footer.html
index 9bb0f4850..dc5cff164 100644
--- a/themes/learn/layouts/partials/custom-footer.html
+++ b/themes/learn/layouts/partials/custom-footer.html
@@ -3,3 +3,21 @@
     console.log("running some javascript");
 </script>
 -->
+    <!-- CloudWatch RUM Client-->
+    <script>
+    (function(n,i,v,r,s,c,x,z){x=window.AwsRumClient={q:[],n:n,i:i,v:v,r:r,c:c};window[n]=function(c,p){x.q.push({c:c,p:p});};z=document.createElement('script');z.async=true;z.src=s;document.head.insertBefore(z,document.head.getElementsByTagName('script')[0]);})(
+      'cwr',
+      '26ea5436-dffe-408e-9d65-9b76cb9449d2',
+      '1.0.0',
+      'us-west-2',
+      'https://client.rum.us-east-1.amazonaws.com/1.19.0/cwr.js',
+      {
+        sessionSampleRate: 1 ,
+        endpoint: "https://dataplane.rum.us-west-2.amazonaws.com" ,
+        telemetries: ["performance","errors","http"] ,
+        allowCookies: true ,
+        enableXRay: false ,
+        signing: true
+      }
+    );
+  </script>
\ No newline at end of file