diff --git a/clouds/bigquery/modules/Makefile b/clouds/bigquery/modules/Makefile
index 5314c6d02..f4f710a9f 100644
--- a/clouds/bigquery/modules/Makefile
+++ b/clouds/bigquery/modules/Makefile
@@ -97,7 +97,9 @@ test: check $(NODE_MODULES_DEV)
 
 remove: check
 	echo "Removing modules..."
-	$(BQ) rm -r -f -d $(BQ_DEPLOY_DATASET)
+	REPLACEMENTS=$(REPLACEMENTS)" "$(REPLACEMENTS_EXTRA) \
+	GOOGLE_APPLICATION_CREDENTIALS=$(GOOGLE_APPLICATION_CREDENTIALS) \
+	$(COMMON_DIR)/run-script.js $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
 remove-functions: check
 	echo "Removing functions..."
diff --git a/clouds/postgres/modules/Makefile b/clouds/postgres/modules/Makefile
index 7f9de5e72..4e62a6d7d 100644
--- a/clouds/postgres/modules/Makefile
+++ b/clouds/postgres/modules/Makefile
@@ -61,7 +61,8 @@ test: check venv3 $(NODE_MODULES_DEV)
 
 remove: venv3
 	echo "Removing modules..."
-	$(VENV3_BIN)/python $(COMMON_DIR)/run_query.py "DROP SCHEMA IF EXISTS $(PG_SCHEMA) CASCADE;"
+	REPLACEMENTS=$(REPLACEMENTS)" "$(REPLACEMENTS_EXTRA) \
+	$(VENV3_BIN)/python $(COMMON_DIR)/run_script.py $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
 remove-functions: venv3
 	echo "Removing functions..."
diff --git a/clouds/redshift/modules/Makefile b/clouds/redshift/modules/Makefile
index 9cc9dbaf8..75a1d8554 100644
--- a/clouds/redshift/modules/Makefile
+++ b/clouds/redshift/modules/Makefile
@@ -61,7 +61,8 @@ test: check venv3 $(NODE_MODULES_DEV)
 
 remove: venv3
 	echo "Removing modules..."
-	$(VENV3_BIN)/python $(COMMON_DIR)/run_query.py "DROP SCHEMA IF EXISTS $(RS_SCHEMA) CASCADE;"
+	REPLACEMENTS=$(REPLACEMENTS)" "$(REPLACEMENTS_EXTRA) \
+	$(VENV3_BIN)/python $(COMMON_DIR)/run_script.py $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
 remove-functions: venv3
 	echo "Removing functions..."
diff --git a/clouds/snowflake/modules/Makefile b/clouds/snowflake/modules/Makefile
index 1ecaf1858..d557139f4 100644
--- a/clouds/snowflake/modules/Makefile
+++ b/clouds/snowflake/modules/Makefile
@@ -107,7 +107,8 @@ test: check $(NODE_MODULES_DEV)
 
 remove: $(NODE_MODULES_DEV)
 	echo "Removing modules..."
-	$(COMMON_DIR)/run-query.js "DROP SCHEMA IF EXISTS $(SF_SCHEMA) CASCADE;"
+	REPLACEMENTS=$(REPLACEMENTS)" "$(REPLACEMENTS_EXTRA) \
+	$(COMMON_DIR)/run-script.js $(COMMON_DIR)/DROP_FUNCTIONS.sql
 
 remove-functions: $(NODE_MODULES_DEV)
 	echo "Removing functions..."