diff --git a/README.md b/README.md
index 11c2a36..1997042 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,6 @@ sys     0m2.015s
 | <a name="input_region"></a> [region](#input\_region) | AWS region | `string` | n/a | yes |
 | <a name="input_security_group_all_worker_mgmt_id"></a> [security\_group\_all\_worker\_mgmt\_id](#input\_security\_group\_all\_worker\_mgmt\_id) | The security group representing all of the worker nodes in the cluster. | `string` | n/a | yes |
 | <a name="input_subnets"></a> [subnets](#input\_subnets) | Specify the subnets used by this cluster | `list(string)` | n/a | yes |
-| <a name="input_tag_costallocation"></a> [tag\_costallocation](#input\_tag\_costallocation) | Tag CostAllocation (default) | `string` | `"csvd:infrastructure"` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | AWS Tags to apply to appropriate resources | `map(string)` | `{}` | no |
 | <a name="input_telemetry_ns"></a> [telemetry\_ns](#input\_telemetry\_ns) | Namespace to create where telemetry will be installed. | `string` | `"telemetry"` | no |
 | <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | Specify the VPC id that is used by this cluster | `string` | n/a | yes |
diff --git a/aws-data.tf b/aws-data.tf
index bb1ee27..96cd77c 100644
--- a/aws-data.tf
+++ b/aws-data.tf
@@ -3,10 +3,3 @@ data "aws_ebs_default_kms_key" "current" {}
 data "aws_kms_key" "ebs_key" {
   key_id = data.aws_ebs_default_kms_key.current.key_arn
 }
-# data "aws_caller_identity" "current" {}
-
-# data "aws_region" "current" {}
-
-# data "aws_arn" "current" {
-#   arn = data.aws_caller_identity.current.arn
-# }
diff --git a/main.tf b/main.tf
index c1d68ae..a56d603 100644
--- a/main.tf
+++ b/main.tf
@@ -1,11 +1,7 @@
 locals {
-  # iam_arn    = format("arn:%v:iam::%v:%%v", data.aws_arn.current.partition, data.aws_caller_identity.current.account_id)
-  # common_arn = format("arn:%v:%%v:%v:%v:%%v", data.aws_arn.current.partition, data.aws_region.current.id, data.aws_caller_identity.current.account_id)
   base_tags = {
-    "eks-cluster-name"      = var.cluster_name
     "boc:tf_module_version" = local.module_version
     "boc:created_by"        = "terraform"
-    CostAllocation          = var.tag_costallocation
   }
 
   tags = merge(local.base_tags, var.tags)
diff --git a/prefixes.tf.off b/prefixes.tf.off
deleted file mode 100644
index 4e2709e..0000000
--- a/prefixes.tf.off
+++ /dev/null
@@ -1,34 +0,0 @@
-locals {
-  prefixes = {
-    "efs"            = "v-efs-"
-    "s3"             = "v-s3-"
-    "ebs"            = "v-ebs-"
-    "kms"            = "k-kms-"
-    "role"           = "r-"
-    "policy"         = "p-"
-    "group"          = "g-"
-    "security-group" = "" # "sg-"
-    # VPC
-    "vpc"              = ""
-    "dhcp-options"     = ""
-    "vpc-peer"         = "vpcp-"
-    "route-table"      = "route-"
-    "subnet"           = ""
-    "vpc-endpoint"     = "vpce-"
-    "elastic-ip"       = "eip-"
-    "nat-gateway"      = "nat-"
-    "internet-gateway" = "igw-"
-    "network-acl"      = "nacl-"
-    "customer-gateway" = "cgw-"
-    "vpn-gateway"      = "vpcg-"
-    "vpn-connection"   = "vpn_"
-    "log-group"        = "lg-"
-    "log-stream"       = "lgs-"
-    # EKS
-    "eks"                = "eks-"
-    "eks-user"           = "s-eks-"
-    "eks-role"           = "r-eks-"
-    "eks-policy"         = "p-eks-"
-    "eks-security-group" = "eks-sg-" # "sg-eks-"
-  }
-}
diff --git a/variables.tf b/variables.tf
index 6872c2c..6b74bc4 100644
--- a/variables.tf
+++ b/variables.tf
@@ -42,12 +42,6 @@ variable "telemetry_ns" {
   default     = "telemetry"
 }
 
-variable "tag_costallocation" {
-  description = "Tag CostAllocation (default)"
-  type        = string
-  default     = "csvd:infrastructure"
-}
-
 variable "tags" {
   description = "AWS Tags to apply to appropriate resources"
   type        = map(string)