diff --git a/layouts/shortcodes/aws-resource-collection-cloud-cost-management.md b/layouts/shortcodes/aws-resource-collection-cloud-cost-management.md
deleted file mode 100644
index 5a3d75a40a966..0000000000000
--- a/layouts/shortcodes/aws-resource-collection-cloud-cost-management.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-{}
----
-| Resource Type | Permissions |
-| ------------- | ----------- |
-| aws:ec2:volume | ec2:DescribeVolumes |
-| aws:ec2:availabilityzone | ec2:DescribeAvailabilityZones |
-| aws:ec2:instance | ec2:DescribeInstances |
diff --git a/layouts/shortcodes/aws-resource-collection-cloud-security-monitoring.md b/layouts/shortcodes/aws-resource-collection-cloud-security-monitoring.md
deleted file mode 100644
index ac761d3db7300..0000000000000
--- a/layouts/shortcodes/aws-resource-collection-cloud-security-monitoring.md
+++ /dev/null
@@ -1,128 +0,0 @@
----
-{}
----
-| Resource Type | Permissions |
-| ------------- | ----------- |
-| aws:accessanalyzer:analyzer | access-analyzer:GetAnalyzer,<br/>access-analyzer:ListAnalyzers |
-| aws:account:account | organizations:DescribeOrganization,<br/>account:GetAlternateContact,<br/>account:GetContactInformation,<br/>organizations:ListAccounts |
-| aws:acm:acm | acm:DescribeCertificate,<br/>acm:ListCertificates |
-| aws:apigateway:api | apigateway:GetRestApis |
-| aws:apigateway:integration | apigateway:GetMethod,<br/>apigateway:GetResources,<br/>apigateway:GetRestApis |
-| aws:apigateway:stage | apigateway:GetRestApis,<br/>apigateway:GetStages |
-| aws:apigatewayv2:api | apigateway:GetApis |
-| aws:apigatewayv2:route | apigateway:GetApis,<br/>apigateway:GetRoutes |
-| aws:apigatewayv2:stage | apigateway:GetApis,<br/>apigateway:GetStages |
-| aws:applicationautoscaling:scalingactivity | applicationautoscaling:DescribeScalingActivities |
-| aws:appsync:graphqlapi | appsync:ListGraphqlApis |
-| aws:athena:workgroup | athena:GetWorkGroup,<br/>athena:ListWorkGroups |
-| aws:autoscaling:group | autoscaling:DescribeAutoScalingGroups |
-| aws:autoscaling:launchconfiguration | autoscaling:DescribeLaunchConfigurations |
-| aws:backup:plan | backup:ListBackupPlans |
-| aws:backup:recoverypoint | backup:ListBackupVaults,<br/>backup:ListRecoveryPointsByBackupVault |
-| aws:cloudformation:stack | cloudformation:DescribeStacks,<br/>cloudformation:ListStacks |
-| aws:cloudfront:distribution | cloudfront:GetDistribution,<br/>cloudfront:ListDistributions |
-| aws:cloudtrail:trail | cloudtrail:DescribeTrails,<br/>cloudtrail:GetEventSelectors,<br/>cloudtrail:GetTrailStatus |
-| aws:cloudwatchlogs:metricfilter | cloudwatchlogs:DescribeMetricFilters |
-| aws:codebuild:project | codebuild:BatchGetProjects,<br/>codebuild:ListProjects |
-| aws:cognitoidentity:identitypool | cognito-identity:DescribeIdentityPool,<br/>cognito-identity:GetIdentityPoolRoles,<br/>cognito-identity:ListIdentityPools |
-| aws:cognitoidentityprovider:userpool | cognito-idp:DescribeUserPool,<br/>cognito-idp:ListIdentityProviders,<br/>cognito-idp:ListUserPools |
-| aws:configservice:recorder | config:DescribeConfigurationRecorders |
-| aws:configservice:recorderstatus | config:DescribeConfigurationRecorderStatus |
-| aws:dms:endpoint | dms:DescribeEndpoints |
-| aws:dms:replicationinstance | dms:DescribeReplicationInstances |
-| aws:dms:replicationtask | dms:DescribeReplicationTasks |
-| aws:dax:cluster | dax:DescribeClusters |
-| aws:docdb:cluster | rds:DescribeDBClusters |
-| aws:dynamodb:table | dynamodb:DescribeContinuousBackups,<br/>dynamodb:DescribeTable,<br/>dynamodb:DescribeTimeToLive,<br/>dynamodb:ListTables |
-| aws:ec2:ebs-encryption-by-default | ec2:GetEbsEncryptionByDefault |
-| aws:ec2:snapshot | ec2:DescribeSnapshotAttribute,<br/>ec2:DescribeSnapshots |
-| aws:ec2:volume | ec2:DescribeVolumes |
-| aws:ec2:image | ec2:DescribeImageAttribute,<br/>ec2:DescribeImages |
-| aws:ec2:vpnconnection | ec2:DescribeVpnConnections |
-| aws:ec2:instance | ec2:DescribeInstances |
-| aws:ec2:launchtemplateversion | ec2:DescribeLaunchTemplateVersions,<br/>ec2:DescribeLaunchTemplates |
-| aws:ec2:networkacl | ec2:DescribeNetworkAcls |
-| aws:ec2:networkinterface | ec2:DescribeNetworkInterfaces |
-| aws:ec2:publicimage | ec2:DescribeImages |
-| aws:ec2:region | ec2:DescribeRegions |
-| aws:ec2:securitygroup | ec2:DescribeSecurityGroups |
-| aws:ec2:vpcendpoint | ec2:DescribeVpcEndpoints |
-| aws:ec2:vpc | ec2:DescribeVpcs |
-| aws:ec2:vpcflowlog | ec2:DescribeFlowLogs |
-| aws:ec2:elasticip | ec2:DescribeAddresses |
-| aws:ec2:vpcinternetgateway | ec2:DescribeInternetGateways |
-| aws:ec2:vpcnatgateway | ec2:DescribeNatGateways |
-| aws:ec2:routetable | ec2:DescribeRouteTables |
-| aws:ec2:client-vpn-endpoint | ec2:DescribeClientVpnEndpoints |
-| aws:ecr:repository | ecr:DescribeRepositories,<br/>ecr:GetLifecyclePolicy,<br/>ecr:GetRepositoryPolicy |
-| aws:ecrpublic:repository | ecr-public:DescribeImages,<br/>ecr-public:DescribeRepositories,<br/>ecr-public:GetRepositoryPolicy |
-| aws:ecs:cluster | ecs:DescribeClusters,<br/>ecs:ListClusters |
-| aws:ecs:service | ecs:DescribeServices,<br/>ecs:ListClusters,<br/>ecs:ListServices |
-| aws:ecs:task | ecs:DescribeTasks,<br/>ecs:ListClusters,<br/>ecs:ListTasks |
-| aws:ecs:task-definition | ecs:DescribeTaskDefinition,<br/>ecs:DescribeTasks,<br/>ecs:ListClusters,<br/>ecs:ListTasks |
-| aws:efs:accesspoint | elasticfilesystem:DescribeAccessPoints |
-| aws:efs:filesystem | elasticfilesystem:DescribeFileSystems,<br/>elasticfilesystem:DescribeLifecycleConfiguration |
-| aws:eks:cluster | eks:DescribeCluster,<br/>eks:ListClusters |
-| aws:eks:nodegroup | eks:DescribeCluster,<br/>eks:DescribeNodeGroup,<br/>eks:ListClusters,<br/>eks:ListNodeGroups |
-| aws:elasticache:replicationgroup | elasticache:DescribeReplicationGroups |
-| aws:elasticache:cluster | elasticache:DescribeCacheClusters |
-| aws:elasticbeanstalk:environment | elasticbeanstalk:DescribeConfigurationSettings,<br/>elasticbeanstalk:DescribeEnvironments |
-| aws:elasticloadbalancing:loadbalancer | elasticloadbalancing:DescribeInstanceHealth,<br/>elasticloadbalancing:DescribeLoadBalancerAttributes,<br/>elasticloadbalancing:DescribeLoadBalancerPolicies,<br/>elasticloadbalancing:DescribeLoadBalancers |
-| aws:elasticloadbalancingv2:loadbalancer | elasticloadbalancing:DescribeListeners,<br/>elasticloadbalancing:DescribeLoadBalancerAttributes,<br/>elasticloadbalancing:DescribeLoadBalancers |
-| aws:elasticloadbalancingv2:targetgroup | elasticloadbalancing:DescribeTargetGroups,<br/>elasticloadbalancing:DescribeTargetHealth |
-| aws:elasticsearchservice:domain | es:DescribeElasticsearchDomains,<br/>es:ListDomainNames |
-| aws:eventbridge:eventbus | events:ListEventBuses,<br/>events:ListRules |
-| aws:iam:account | iam:GetAccountPasswordPolicy,<br/>iam:GetAccountSummary |
-| aws:iam:instanceprofile | iam:ListInstanceProfiles |
-| aws:iam:server-certificate | iam:ListServerCertificates |
-| aws:iam:group | iam:ListAttachedGroupPolicies,<br/>iam:ListGroups |
-| aws:iam:groupinlinepolicy | iam:GetGroupPolicy,<br/>iam:ListGroupPolicies,<br/>iam:ListGroups |
-| aws:iam:policy | iam:GetPolicyVersion,<br/>iam:ListPolicies |
-| aws:iam:role | iam:GetAccountAuthorizationDetails |
-| aws:iam:roleinlinepolicy | iam:GetAccountAuthorizationDetails |
-| aws:iam:accesskeymetadata | iam:GetUser,<br/>iam:ListAccessKeys,<br/>iam:ListUsers,<br/>iam:ListVirtualMFADevices |
-| aws:iam:user | iam:GetLoginProfile,<br/>iam:GetUser,<br/>iam:ListAttachedUserPolicies,<br/>iam:ListGroupsForUser,<br/>iam:ListMFADevices,<br/>iam:ListSSHPublicKeys,<br/>iam:ListUsers,<br/>iam:ListVirtualMFADevices |
-| aws:iam:userinlinepolicy | iam:GetUser,<br/>iam:GetUserPolicy,<br/>iam:ListUserPolicies,<br/>iam:ListUsers,<br/>iam:ListVirtualMFADevices |
-| aws:iam:virtualmfadevice | iam:ListUsers,<br/>iam:ListVirtualMFADevices |
-| aws:kinesis:stream | kinesis:DescribeStreamSummary,<br/>kinesis:ListStreams |
-| aws:kms:alias | kms:GetKeyPolicy,<br/>kms:ListAliases |
-| aws:kms:key | kms:DescribeKey,<br/>kms:GetKeyRotationStatus,<br/>kms:ListKeys |
-| aws:lambda:eventsourcemapping | lambda:ListEventSourceMappings,<br/>lambda:ListFunctions |
-| aws:lambda:function | lambda:GetPolicy,<br/>lambda:ListFunctionUrlConfigs,<br/>lambda:ListFunctions,<br/>lambda:ListProvisionedConcurrencyConfigs |
-| aws:lightsail:instance | lightsail:GetInstancePortStates,<br/>lightsail:GetInstances |
-| aws:cloudwatch:metricalarm | cloudwatch:DescribeAlarms |
-| aws:cloudwatchlogs:metricfilter | cloudwatchlogs:DescribeMetricFilters |
-| aws:neptune:cluster | rds:DescribeDBClusters |
-| aws:neptune:cluster-snapshot | rds:DescribeDBClusterSnapshotAttributes,<br/>rds:DescribeDBClusterSnapshots |
-| aws:neptune:dbinstance | rds:DescribeDBInstances |
-| aws:network-firewall:firewall | network-firewall:DescribeFirewall,<br/>network-firewall:DescribeFirewallPolicy,<br/>network-firewall:DescribeLoggingConfiguration,<br/>network-firewall:ListFirewalls |
-| aws:opensearch:domain | es:DescribeDomain,<br/>es:ListDomainNames |
-| aws:rds:cluster | rds:DescribeDBClusterEndpoints,<br/>rds:DescribeDBClusters |
-| aws:rds:cluster-snapshot | rds:DescribeDBClusterSnapshotAttributes,<br/>rds:DescribeDBClusterSnapshots |
-| aws:rds:eventsubscription | rds:DescribeEventSubscriptions |
-| aws:rds:instance | rds:DescribeDBInstances |
-| aws:rds:snapshot | rds:DescribeDBSnapshotAttributes,<br/>rds:DescribeDBSnapshots |
-| aws:redshift:cluster | redshift:DescribeClusterParameters,<br/>redshift:DescribeClusters,<br/>redshift:DescribeEndpointAccess,<br/>redshift:DescribeLoggingStatus |
-| aws:route53:hostedzone | route53:GetDNSSEC,<br/>route53:GetHostedZone,<br/>route53:ListHostedZones |
-| aws:route53:resourcerecordset | route53:ListHostedZones,<br/>route53:ListResourceRecordSets |
-| aws:route53domains:domain | route53domains:ListDomains |
-| aws:s3:bucket | s3:GetBucketAcl,<br/>s3:GetEncryptionConfiguration,<br/>s3:GetLifecycleConfiguration,<br/>s3:GetBucketLogging,<br/>s3:GetBucketMetadataTableConfiguration,<br/>s3:GetBucketNotification,<br/>s3:GetBucketPolicy,<br/>s3:GetBucketPolicyStatus,<br/>s3:GetReplicationConfiguration,<br/>s3:GetBucketVersioning,<br/>s3:GetBucketWebsite,<br/>s3:GetBucketPublicAccessBlock,<br/>s3:GetInventoryConfiguration,<br/>s3:ListAllMyBuckets |
-| aws:s3control:accountpublicaccessblock | s3:GetBucketPublicAccessBlock |
-| aws:sagemaker:notebookinstance | sagemaker:DescribeNotebookInstance,<br/>sagemaker:ListNotebookInstances |
-| aws:secretsmanager:secret | secretsmanager:DescribeSecret,<br/>secretsmanager:GetResourcePolicy,<br/>secretsmanager:ListSecrets |
-| aws:securityhub:hub | securityhub:DescribeHub |
-| aws:sfn:statemachine | states:DescribeStateMachine,<br/>states:ListStateMachines |
-| aws:sns:topic | sns:GetTopicAttributes,<br/>sns:ListTopics |
-| aws:sqs:queue | sqs:GetQueueAttributes,<br/>sqs:ListQueues |
-| aws:ssm:instance | ssm:DescribeInstanceInformation,<br/>ssm:ListComplianceItems |
-| aws:ec2:subnet | ec2:DescribeSubnets |
-| aws:ec2:transitgateway | ec2:DescribeTransitGateways |
-| aws:wafv2:acl | wafv2:GetLoggingConfiguration,<br/>wafv2:GetWebACL,<br/>wafv2:ListWebACLs |
-| aws:wafv2:ipset | wafv2:GetIPSet,<br/>wafv2:ListIPSets |
-| aws:wafv2:regexpatternset | wafv2:GetRegexPatternSet,<br/>wafv2:ListRegexPatternSets |
-| aws:wafv2:rulegroup | wafv2:GetRuleGroup,<br/>wafv2:ListRuleGroups |
-| aws:wafv2:acl | wafv2:GetLoggingConfiguration,<br/>wafv2:GetWebACL,<br/>wafv2:ListResourcesForWebACL,<br/>wafv2:ListWebACLs |
-| aws:wafv2:ipset | wafv2:GetIPSet,<br/>wafv2:ListIPSets |
-| aws:wafv2:regexpatternset | wafv2:GetRegexPatternSet,<br/>wafv2:ListRegexPatternSets |
-| aws:wafv2:rulegroup | wafv2:GetRuleGroup,<br/>wafv2:ListRuleGroups |
-| aws:iam:credentialreport | iam:GenerateCredentialReport,<br/>iam:GetCredentialReport |
diff --git a/layouts/shortcodes/aws-resource-collection-cloudcraft.md b/layouts/shortcodes/aws-resource-collection-cloudcraft.md
deleted file mode 100644
index 328ff8c93b9de..0000000000000
--- a/layouts/shortcodes/aws-resource-collection-cloudcraft.md
+++ /dev/null
@@ -1,88 +0,0 @@
----
-{}
----
-| Resource Type | Permissions |
-| ------------- | ----------- |
-| aws:apigateway:api | apigateway:GetRestApis |
-| aws:apigatewayv2:api | apigateway:GetApis |
-| aws:autoscaling:group | autoscaling:DescribeAutoScalingGroups |
-| aws:cloudfront:distribution | cloudfront:GetDistribution,<br/>cloudfront:ListDistributions |
-| aws:directconnect:connection | directconnect:DescribeConnections |
-| aws:docdb:cluster | rds:DescribeDBClusters |
-| aws:dynamodb:table | dynamodb:DescribeContinuousBackups,<br/>dynamodb:DescribeTable,<br/>dynamodb:DescribeTimeToLive,<br/>dynamodb:ListTables |
-| aws:ec2:ebs-encryption-by-default | ec2:GetEbsEncryptionByDefault |
-| aws:ec2:snapshot | ec2:DescribeSnapshotAttribute,<br/>ec2:DescribeSnapshots |
-| aws:ec2:volume | ec2:DescribeVolumes |
-| aws:ec2:availabilityzone | ec2:DescribeAvailabilityZones |
-| aws:ec2:customergateway | ec2:DescribeCustomerGateways |
-| aws:ec2:vpnconnection | ec2:DescribeVpnConnections |
-| aws:ec2:vpngateway | ec2:DescribeVpnGateways |
-| aws:ec2:instance | ec2:DescribeInstances |
-| aws:ec2:securitygroup | ec2:DescribeSecurityGroups |
-| aws:ec2:vpcendpoint | ec2:DescribeVpcEndpoints |
-| aws:ec2:vpc | ec2:DescribeVpcs |
-| aws:ec2:vpcinternetgateway | ec2:DescribeInternetGateways |
-| aws:ec2:vpcnatgateway | ec2:DescribeNatGateways |
-| aws:ecr:repository | ecr:DescribeRepositories,<br/>ecr:GetLifecyclePolicy,<br/>ecr:GetRepositoryPolicy |
-| aws:ecrpublic:repository | ecr-public:DescribeImages,<br/>ecr-public:DescribeRepositories,<br/>ecr-public:GetRepositoryPolicy |
-| aws:ecs:cluster | ecs:DescribeClusters,<br/>ecs:ListClusters |
-| aws:ecs:service | ecs:DescribeServices,<br/>ecs:ListClusters,<br/>ecs:ListServices |
-| aws:efs:accesspoint | elasticfilesystem:DescribeAccessPoints |
-| aws:efs:filesystem | elasticfilesystem:DescribeFileSystems,<br/>elasticfilesystem:DescribeLifecycleConfiguration |
-| aws:efs:mounttarget | elasticfilesystem:DescribeFileSystems,<br/>elasticfilesystem:DescribeMountTargetSecurityGroups,<br/>elasticfilesystem:DescribeMountTargets |
-| aws:eks:cluster | eks:DescribeCluster,<br/>eks:ListClusters |
-| aws:eks:nodegroup | eks:DescribeCluster,<br/>eks:DescribeNodeGroup,<br/>eks:ListClusters,<br/>eks:ListNodeGroups |
-| aws:elasticache:cachesubnetgroup | elasticache:DescribeCacheSubnetGroups |
-| aws:elasticache:parametergroup | elasticache:DescribeCacheParameterGroups |
-| aws:elasticache:replicationgroup | elasticache:DescribeReplicationGroups |
-| aws:elasticache:securitygroup | elasticache:DescribeCacheSecurityGroups |
-| aws:elasticache:snapshot | elasticache:DescribeSnapshots |
-| aws:elasticache:user | elasticache:DescribeUsers |
-| aws:elasticache:usergroup | elasticache:DescribeUserGroups |
-| aws:elasticache:cluster | elasticache:DescribeCacheClusters |
-| aws:elasticloadbalancing:loadbalancer | elasticloadbalancing:DescribeInstanceHealth,<br/>elasticloadbalancing:DescribeLoadBalancerAttributes,<br/>elasticloadbalancing:DescribeLoadBalancerPolicies,<br/>elasticloadbalancing:DescribeLoadBalancers |
-| aws:elasticloadbalancingv2:loadbalancer | elasticloadbalancing:DescribeListeners,<br/>elasticloadbalancing:DescribeLoadBalancerAttributes,<br/>elasticloadbalancing:DescribeLoadBalancers |
-| aws:elasticsearchservice:domain | es:DescribeElasticsearchDomains,<br/>es:ListDomainNames |
-| aws:eventbridge:eventbus | events:ListEventBuses,<br/>events:ListRules |
-| aws:fsx:backup | fsx:DescribeBackups |
-| aws:fsx:file-system | fsx:DescribeFileSystems |
-| aws:glacier:vault | glacier:GetVaultNotifications,<br/>glacier:ListVaults |
-| aws:keyspaces:keyspace | cassandra:Select |
-| aws:kinesis:stream | kinesis:DescribeStreamSummary,<br/>kinesis:ListStreams |
-| aws:lambda:function | lambda:GetPolicy,<br/>lambda:ListFunctionUrlConfigs,<br/>lambda:ListFunctions,<br/>lambda:ListProvisionedConcurrencyConfigs |
-| aws:neptune:cluster | rds:DescribeDBClusters |
-| aws:neptune:cluster-snapshot | rds:DescribeDBClusterSnapshotAttributes,<br/>rds:DescribeDBClusterSnapshots |
-| aws:neptune:dbinstance | rds:DescribeDBInstances |
-| aws:rds:cluster | rds:DescribeDBClusterEndpoints,<br/>rds:DescribeDBClusters |
-| aws:rds:cluster-snapshot | rds:DescribeDBClusterSnapshotAttributes,<br/>rds:DescribeDBClusterSnapshots |
-| aws:rds:dbclusterparametergroup | rds:DescribeDBClusterParameterGroups |
-| aws:rds:dbinstanceautomatedbackup | rds:DescribeDBInstanceAutomatedBackups |
-| aws:rds:dbparametergroup | rds:DescribeDBParameterGroups |
-| aws:rds:dbsubnetgroup | rds:DescribeDBSubnetGroups |
-| aws:rds:eventsubscription | rds:DescribeEventSubscriptions |
-| aws:rds:exporttask | rds:DescribeExportTasks |
-| aws:rds:instance | rds:DescribeDBInstances |
-| aws:rds:optiongroup | rds:DescribeOptionGroups |
-| aws:rds:securitygroup | rds:DescribeDBSecurityGroups |
-| aws:rds:snapshot | rds:DescribeDBSnapshotAttributes,<br/>rds:DescribeDBSnapshots |
-| aws:rds:reserveddbinstance | rds:DescribeReservedDBInstances |
-| aws:redshift:eventsubscription | redshift:DescribeEventSubscriptions |
-| aws:redshift:parametergroup | redshift:DescribeClusterParameterGroups |
-| aws:redshift:securitygroup | redshift:DescribeClusterSecurityGroups |
-| aws:redshift:snapshot | redshift:DescribeClusterSnapshots,<br/>redshift:DescribeClusters |
-| aws:redshift:subnetgroup | redshift:DescribeClusterSubnetGroups,<br/>redshift:DescribeClusters |
-| aws:route53:hostedzone | route53:GetDNSSEC,<br/>route53:GetHostedZone,<br/>route53:ListHostedZones |
-| aws:s3:bucket | s3:GetBucketAcl,<br/>s3:GetEncryptionConfiguration,<br/>s3:GetLifecycleConfiguration,<br/>s3:GetBucketLogging,<br/>s3:GetBucketMetadataTableConfiguration,<br/>s3:GetBucketNotification,<br/>s3:GetBucketPolicy,<br/>s3:GetBucketPolicyStatus,<br/>s3:GetReplicationConfiguration,<br/>s3:GetBucketVersioning,<br/>s3:GetBucketWebsite,<br/>s3:GetBucketPublicAccessBlock,<br/>s3:GetInventoryConfiguration,<br/>s3:ListAllMyBuckets |
-| aws:sns:subscription | sns:ListSubscriptions |
-| aws:sns:topic | sns:GetTopicAttributes,<br/>sns:ListTopics |
-| aws:sqs:queue | sqs:GetQueueAttributes,<br/>sqs:ListQueues |
-| aws:ec2:subnet | ec2:DescribeSubnets |
-| aws:timestreamwrite:table | timestream:ListTables |
-| aws:ec2:transitgateway | ec2:DescribeTransitGateways |
-| aws:waf:acl | waf:GetWebACL,<br/>waf:ListWebACLs |
-| aws:waf:rule | waf:GetRule,<br/>waf:ListRules |
-| aws:waf:rulegroup | waf:GetRuleGroup,<br/>waf:ListRuleGroups |
-| aws:wafregional:acl | waf-regional:GetWebACL,<br/>waf-regional:ListWebACLs |
-| aws:wafregional:rule | waf-regional:GetRule,<br/>waf-regional:ListRules |
-| aws:wafregional:rulegroup | waf-regional:GetRuleGroup,<br/>waf-regional:ListRuleGroups |
-| aws:wafv2:acl | wafv2:GetLoggingConfiguration,<br/>wafv2:GetWebACL,<br/>wafv2:ListResourcesForWebACL,<br/>wafv2:ListWebACLs |
diff --git a/layouts/shortcodes/aws-resource-collection-network-performance-monitoring.md b/layouts/shortcodes/aws-resource-collection-network-performance-monitoring.md
deleted file mode 100644
index ede359ca3b25e..0000000000000
--- a/layouts/shortcodes/aws-resource-collection-network-performance-monitoring.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-{}
----
-| Resource Type | Permissions |
-| ------------- | ----------- |
-| aws:ec2:vpngateway | ec2:DescribeVpnGateways |
-| aws:ec2:egressonlyinternetgateway | ec2:DescribeEgressOnlyInternetGateways |
-| aws:ec2:vpcinternetgateway | ec2:DescribeInternetGateways |
-| aws:ec2:vpcnatgateway | ec2:DescribeNatGateways |
-| aws:ec2:vpcendpointconnectionnotification | ec2:DescribeVpcEndpointConnectionNotifications |
-| aws:ec2:vpcpeeringconnection | ec2:DescribeVpcPeeringConnections |
-| aws:network-firewall:firewall | network-firewall:DescribeFirewall,<br/>network-firewall:DescribeFirewallPolicy,<br/>network-firewall:DescribeLoggingConfiguration,<br/>network-firewall:ListFirewalls |
-| aws:ec2:transitgateway | ec2:DescribeTransitGateways |
diff --git a/layouts/shortcodes/aws-resource-collection-resource-catalog.md b/layouts/shortcodes/aws-resource-collection-resource-catalog.md
deleted file mode 100644
index 72a8afcf1185d..0000000000000
--- a/layouts/shortcodes/aws-resource-collection-resource-catalog.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-{}
----
-| Resource Type | Permissions |
-| ------------- | ----------- |
-| aws:acm:acm | acm:DescribeCertificate,<br/>acm:ListCertificates |
-| aws:cloudfront:distribution | cloudfront:GetDistribution,<br/>cloudfront:ListDistributions |
-| aws:cloudtrail:trail | cloudtrail:DescribeTrails,<br/>cloudtrail:GetEventSelectors,<br/>cloudtrail:GetTrailStatus |
-| aws:docdb:cluster | rds:DescribeDBClusters |
-| aws:dynamodb:table | dynamodb:DescribeContinuousBackups,<br/>dynamodb:DescribeTable,<br/>dynamodb:DescribeTimeToLive,<br/>dynamodb:ListTables |
-| aws:ec2:snapshot | ec2:DescribeSnapshotAttribute,<br/>ec2:DescribeSnapshots |
-| aws:ec2:volume | ec2:DescribeVolumes |
-| aws:ec2:image | ec2:DescribeImageAttribute,<br/>ec2:DescribeImages |
-| aws:ec2:instance | ec2:DescribeInstances |
-| aws:ec2:networkacl | ec2:DescribeNetworkAcls |
-| aws:ec2:networkinterface | ec2:DescribeNetworkInterfaces |
-| aws:ec2:securitygroup | ec2:DescribeSecurityGroups |
-| aws:ec2:vpcendpoint | ec2:DescribeVpcEndpoints |
-| aws:ec2:vpc | ec2:DescribeVpcs |
-| aws:ec2:vpcnatgateway | ec2:DescribeNatGateways |
-| aws:ecs:cluster | ecs:DescribeClusters,<br/>ecs:ListClusters |
-| aws:eks:cluster | eks:DescribeCluster,<br/>eks:ListClusters |
-| aws:elasticache:cluster | elasticache:DescribeCacheClusters |
-| aws:elasticloadbalancing:loadbalancer | elasticloadbalancing:DescribeInstanceHealth,<br/>elasticloadbalancing:DescribeLoadBalancerAttributes,<br/>elasticloadbalancing:DescribeLoadBalancerPolicies,<br/>elasticloadbalancing:DescribeLoadBalancers |
-| aws:elasticloadbalancingv2:loadbalancer | elasticloadbalancing:DescribeListeners,<br/>elasticloadbalancing:DescribeLoadBalancerAttributes,<br/>elasticloadbalancing:DescribeLoadBalancers |
-| aws:elasticsearchservice:domain | es:DescribeElasticsearchDomains,<br/>es:ListDomainNames |
-| aws:iam:account | iam:GetAccountPasswordPolicy,<br/>iam:GetAccountSummary |
-| aws:iam:server-certificate | iam:ListServerCertificates |
-| aws:iam:policy | iam:GetPolicyVersion,<br/>iam:ListPolicies |
-| aws:iam:role | iam:GetAccountAuthorizationDetails |
-| aws:iam:user | iam:GetLoginProfile,<br/>iam:GetUser,<br/>iam:ListAttachedUserPolicies,<br/>iam:ListGroupsForUser,<br/>iam:ListMFADevices,<br/>iam:ListSSHPublicKeys,<br/>iam:ListUsers,<br/>iam:ListVirtualMFADevices |
-| aws:kms:key | kms:DescribeKey,<br/>kms:GetKeyRotationStatus,<br/>kms:ListKeys |
-| aws:lambda:function | lambda:GetPolicy,<br/>lambda:ListFunctionUrlConfigs,<br/>lambda:ListFunctions,<br/>lambda:ListProvisionedConcurrencyConfigs |
-| aws:mq:broker | mq:DescribeBroker,<br/>mq:ListBrokers |
-| aws:rds:instance | rds:DescribeDBInstances |
-| aws:rds:snapshot | rds:DescribeDBSnapshotAttributes,<br/>rds:DescribeDBSnapshots |
-| aws:redshift:cluster | redshift:DescribeClusterParameters,<br/>redshift:DescribeClusters,<br/>redshift:DescribeEndpointAccess,<br/>redshift:DescribeLoggingStatus |
-| aws:s3:bucket | s3:GetBucketAcl,<br/>s3:GetEncryptionConfiguration,<br/>s3:GetLifecycleConfiguration,<br/>s3:GetBucketLogging,<br/>s3:GetBucketMetadataTableConfiguration,<br/>s3:GetBucketNotification,<br/>s3:GetBucketPolicy,<br/>s3:GetBucketPolicyStatus,<br/>s3:GetReplicationConfiguration,<br/>s3:GetBucketVersioning,<br/>s3:GetBucketWebsite,<br/>s3:GetBucketPublicAccessBlock,<br/>s3:GetInventoryConfiguration,<br/>s3:ListAllMyBuckets |
-| aws:s3control:accountpublicaccessblock | s3:GetBucketPublicAccessBlock |
-| aws:sns:topic | sns:GetTopicAttributes,<br/>sns:ListTopics |
-| aws:sqs:queue | sqs:GetQueueAttributes,<br/>sqs:ListQueues |
diff --git a/layouts/shortcodes/aws-resource-collection-upcoming-permissions.md b/layouts/shortcodes/aws-resource-collection-upcoming-permissions.md
deleted file mode 100644
index ddce384a54496..0000000000000
--- a/layouts/shortcodes/aws-resource-collection-upcoming-permissions.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-{}
----
-```json
-[
-  "aps:DescribeRuleGroupsNamespace",
-  "aps:DescribeScraper",
-  "aps:DescribeWorkspace",
-  "aps:ListRuleGroupsNamespaces",
-  "aps:ListScrapers",
-  "aps:ListWorkspaces",
-  "computeoptimizer:GetEnrollmentStatus",
-  "computeoptimizer:GetRDSDatabaseRecommendations",
-  "iotfleetwise:GetCampaign",
-  "iotfleetwise:GetSignalCatalog",
-  "iotfleetwise:GetStateTemplate",
-  "iotfleetwise:GetVehicle",
-  "iotfleetwise:ListCampaigns",
-  "iotfleetwise:ListDecoderManifests",
-  "iotfleetwise:ListFleets",
-  "iotfleetwise:ListSignalCatalogs",
-  "iotfleetwise:ListStateTemplates",
-  "iotfleetwise:ListVehicles",
-  "iotsitewise:DescribeAsset",
-  "iotsitewise:DescribeAssetModel",
-  "iotsitewise:DescribeDashboard",
-  "iotsitewise:DescribeDataset",
-  "iotsitewise:DescribePortal",
-  "iotsitewise:DescribeProject",
-  "iotsitewise:ListAssets",
-  "iotsitewise:ListDashboards",
-  "iotsitewise:ListDatasets",
-  "iotsitewise:ListPortals",
-  "iotsitewise:ListProjects",
-  "iotsitewise:ListTimeSeries",
-  "iottwinmaker:GetComponentType",
-  "iottwinmaker:GetEntity",
-  "iottwinmaker:GetScene",
-  "iottwinmaker:GetWorkspace",
-  "iottwinmaker:ListComponentTypes",
-  "iottwinmaker:ListEntities",
-  "iottwinmaker:ListScenes"
-]
-```