diff --git a/README.md b/README.md
index 090938d..fa97beb 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,6 @@ module "dmrpp-generator" {
   cluster_arn = module.cumulus.ecs_cluster_arn
   region = var.region
   prefix = var.prefix
-  account_id = var.account_id
   
   // Optional Activity Parameters
   docker_image = "ghrcdaac/dmrpp-generator:<tag_num>" // default to the correct release
diff --git a/dmrpp_generator/main.py b/dmrpp_generator/main.py
index 26ba157..91fd4fa 100644
--- a/dmrpp_generator/main.py
+++ b/dmrpp_generator/main.py
@@ -226,9 +226,13 @@ def dmrpp_generate(self, input_file, local=False, dmrpp_meta=None, args=None):
 
 
 def main(event, context):
-    print('main event')
-    print(event)
-    return DMRPPGenerator(**event).process()
+    dmrpp = DMRPPGenerator(**event)
+    try:
+        ret = dmrpp.process()
+    finally:
+        dmrpp.clean_all()
+
+    return ret
 
 
 if __name__ == "__main__":
diff --git a/dmrpp_generator/version.py b/dmrpp_generator/version.py
index 05754cf..8c875d3 100644
--- a/dmrpp_generator/version.py
+++ b/dmrpp_generator/version.py
@@ -1 +1 @@
-__version__ = "v5.0.0"
+__version__ = "v5.0.1"
diff --git a/main.tf b/main.tf
index 4a2ad99..633b6a4 100644
--- a/main.tf
+++ b/main.tf
@@ -15,7 +15,6 @@ module "dmrpp_service" {
 
 module "dmrpp_lambda" {
   source = "./modules/dmrpp_lambda"
-  account_id = var.account_id
 
   region = var.region
   prefix = var.prefix
diff --git a/modules/dmrpp_lambda/variables.tf b/modules/dmrpp_lambda/variables.tf
index bdeefcf..5450188 100644
--- a/modules/dmrpp_lambda/variables.tf
+++ b/modules/dmrpp_lambda/variables.tf
@@ -3,10 +3,6 @@ variable "region" {
   default = "us-west-2"
 }
 
-variable "account_id" {
-  type = string
-}
-
 variable "prefix" {
   type        = string
   description = "Cumulus stack prefix"
diff --git a/variables.tf b/variables.tf
index 1aca3ad..d5b7f78 100644
--- a/variables.tf
+++ b/variables.tf
@@ -3,10 +3,6 @@ variable "aws_profile" {
   default = null
 }
 
-variable "account_id" {
-  type = string
-}
-
 variable "region" {
   type    = string
   default = "us-west-2"