diff --git a/terraform/aws-iac/config.tf b/terraform/aws-iac/config.tf
index ae9d6b6..8fa2a46 100644
--- a/terraform/aws-iac/config.tf
+++ b/terraform/aws-iac/config.tf
@@ -1,8 +1,5 @@
 locals {
-  region               = "eu-west-1"
   billing_alarm_limit  = 20
   billing_alarm_emails = "c.alexandre.pires@alexpires.me"
-  account_id           = data.aws_caller_identity.current.account_id
 }
 
-data "aws_caller_identity" "current" {}
diff --git a/terraform/cloudns-iac/config.tf b/terraform/cloudns-iac/config.tf
index 0562701..efbfd4e 100644
--- a/terraform/cloudns-iac/config.tf
+++ b/terraform/cloudns-iac/config.tf
@@ -43,7 +43,7 @@ locals {
         value = "v=DMARC1; p=none; rua=mailto:admin@a13labs.me"
       },
       {
-        name  = "${local.vps_1.name}"
+        name  = local.vps_1.name
         type  = "A"
         value = local.vps_1.ip
       },
@@ -145,7 +145,7 @@ locals {
         value = "${local.vps_1.name}.alexpires.me"
       },
       {
-        name  = "${local.vps_1.name}"
+        name  = local.vps_1.name
         type  = "A"
         value = local.vps_1.ip
       },
diff --git a/terraform/k8sapps/apps.tf b/terraform/k8sapps/apps.tf
index 4594e13..6642a6d 100644
--- a/terraform/k8sapps/apps.tf
+++ b/terraform/k8sapps/apps.tf
@@ -1,7 +1,6 @@
 module "websites" {
   source            = "../modules/nginx"
   persistent_folder = local.persistent_folder
-  primary_domain    = local.primary_domain
   websites          = local.websites
 }
 
diff --git a/terraform/k8sapps/config.tf b/terraform/k8sapps/config.tf
index 7793009..f048841 100644
--- a/terraform/k8sapps/config.tf
+++ b/terraform/k8sapps/config.tf
@@ -22,20 +22,10 @@ locals {
   nextcloud_sql_backup_cron_schedule   = "40 2 * * *"
   nextcloud_files_backup_cron_schedule = "50 2 * * *"
 
-  # monitoring
-  influxdb_version   = "1.8-alpine"
-  kapacitor_version  = "1.6-alpine"
-  fluent_bit_version = "3.1"
-  telegraf_version   = "1.32-alpine"
-  chronograf_version = "1.9-alpine"
 
   # m3uproxy
-  m3uproxy_version  = "latest"
-  wireguard_version = "1.0.20210914-r4-ls54"
-  squid_version     = "6.1-23.10_edge"
-  m3uproxy_fqdn     = "tv.${local.primary_domain}"
-  geoip_image       = "maxmindinc/geoipupdate"
-  geoip_version     = "latest"
+  m3uproxy_version = "latest"
+  m3uproxy_fqdn    = "tv.${local.primary_domain}"
 
   geoip_cron_schedule = "0 0 * * *"
   geoip_editions = [
@@ -44,9 +34,7 @@ locals {
     "GeoLite2-ASN"
   ]
 
-  # rustdesk
-  rustdesk_version = "latest"
-  rustdesk_fqdn    = "rustdesk.${local.primary_domain}"
+  rustdesk_fqdn = "rustdesk.${local.primary_domain}"
 
   # backup
   local_backup_retention_days      = 2
@@ -57,8 +45,6 @@ locals {
   gitea_files_backup_cron_schedule = "30 2 * * *"
   mail_files_backup_cron_schedule  = "0 3 * * *"
 
-  # mail settings
-  getmail_version       = "v0.0.1-6.19.07"
   fetch_emails_schedule = "*/2 * * * *"
 
   # email settings
diff --git a/terraform/k8sapps/secrets.tf b/terraform/k8sapps/secrets.tf
index f7d03d2..899deca 100644
--- a/terraform/k8sapps/secrets.tf
+++ b/terraform/k8sapps/secrets.tf
@@ -1,8 +1,3 @@
-variable "wordpress_mysql_password" {
-  description = "MySQL access password"
-  type        = string
-  sensitive   = true
-}
 
 variable "mysql_root_password" {
   description = "MySQL root password"
diff --git a/terraform/modules/m3uproxy/resources/m3uproxy/playlist.json b/terraform/modules/m3uproxy/resources/m3uproxy/playlist.json
index 4a7f45b..6084e34 100644
--- a/terraform/modules/m3uproxy/resources/m3uproxy/playlist.json
+++ b/terraform/modules/m3uproxy/resources/m3uproxy/playlist.json
@@ -109,12 +109,6 @@
         "SICReplay.pt": {
             "http_proxy": "http://proxy-pt.m3uproxy.svc.cluster.local:3128"
         },
-        "CNNBrasil.br": {
-            "http_proxy": "http://proxy-pt.m3uproxy.svc.cluster.local:3128"
-        },
-        "RTPInternacional.pt": {
-            "http_proxy": "http://proxy-pt.m3uproxy.svc.cluster.local:3128"
-        },
         "Rádio Comercial": {
             "disable_remap": true
         },
diff --git a/terraform/modules/mail/config.tf b/terraform/modules/mail/config.tf
index 22a8bfd..6099a9b 100644
--- a/terraform/modules/mail/config.tf
+++ b/terraform/modules/mail/config.tf
@@ -4,7 +4,6 @@ locals {
   mailboxes_path    = "${local.mail_path}/mailboxes"
   getmail_path      = "${local.mail_path}/getmail"
   postfix_path      = "${local.mail_path}/postfix"
-  mail_backup_path  = "${local.persistent_folder}/backup.mail"
 
   getmail_jobs = flatten([
     for account in var.email_accounts : [
diff --git a/terraform/modules/nginx/config.tf b/terraform/modules/nginx/config.tf
index 2daf8be..116c7c0 100644
--- a/terraform/modules/nginx/config.tf
+++ b/terraform/modules/nginx/config.tf
@@ -1,7 +1,6 @@
 locals {
   persistent_folder = var.persistent_folder
   websites_path     = "${local.persistent_folder}/web"
-  primary_domain    = var.primary_domain
   websites          = var.websites
 }
 
diff --git a/terraform/modules/nginx/variables.tf b/terraform/modules/nginx/variables.tf
index 86adb67..ddbacb1 100644
--- a/terraform/modules/nginx/variables.tf
+++ b/terraform/modules/nginx/variables.tf
@@ -3,11 +3,6 @@ variable "persistent_folder" {
   type        = string
 }
 
-variable "primary_domain" {
-  description = "The primary domain for the websites"
-  type        = string
-}
-
 variable "tag" {
   description = "The version of the websites to install"
   type        = string
diff --git a/terraform/modules/seafile/config.tf b/terraform/modules/seafile/config.tf
index 2daf8be..3545ab4 100644
--- a/terraform/modules/seafile/config.tf
+++ b/terraform/modules/seafile/config.tf
@@ -1,7 +1,3 @@
 locals {
-  persistent_folder = var.persistent_folder
-  websites_path     = "${local.persistent_folder}/web"
-  primary_domain    = var.primary_domain
-  websites          = var.websites
 }
 
diff --git a/terraform/modules/seafile/variables.tf b/terraform/modules/seafile/variables.tf
index 86adb67..8b13789 100644
--- a/terraform/modules/seafile/variables.tf
+++ b/terraform/modules/seafile/variables.tf
@@ -1,23 +1 @@
-variable "persistent_folder" {
-  description = "The path to the persistent folder"
-  type        = string
-}
 
-variable "primary_domain" {
-  description = "The primary domain for the websites"
-  type        = string
-}
-
-variable "tag" {
-  description = "The version of the websites to install"
-  type        = string
-  default     = "stable-alpine"
-}
-
-variable "websites" {
-  description = "A list of websites to be deployed"
-  type = map(object({
-    domain_name = string
-    fqdn        = list(string)
-  }))
-}