diff --git a/datahub-web-react/build.gradle b/datahub-web-react/build.gradle
index 6e58e4aec1..3ffafa9244 100644
--- a/datahub-web-react/build.gradle
+++ b/datahub-web-react/build.gradle
@@ -74,7 +74,7 @@ clean {
   delete 'build'
   delete 'just'
   delete 'src/types.generated.ts'
-  delete 'src/graphql/*.generated.ts'
+  delete fileTree(dir: 'src/graphql', include: '*.generated.ts')
 }
 
 configurations {
diff --git a/docs-website/build.gradle b/docs-website/build.gradle
index aff51ab7a4..1c233dc0b0 100644
--- a/docs-website/build.gradle
+++ b/docs-website/build.gradle
@@ -124,6 +124,9 @@ clean {
   delete 'tmp'
   delete 'build'
   delete 'just'
+  delete fileTree(dir: 'genDocs', exclude: '.gitignore')
+  delete fileTree(dir: 'docs', exclude: '.gitignore')
+  delete 'graphql/combined.graphql'
   yarnClear
 }
 
diff --git a/metadata-ingestion-modules/airflow-plugin/build.gradle b/metadata-ingestion-modules/airflow-plugin/build.gradle
index c1e4e07b97..e8b1b08391 100644
--- a/metadata-ingestion-modules/airflow-plugin/build.gradle
+++ b/metadata-ingestion-modules/airflow-plugin/build.gradle
@@ -88,7 +88,7 @@ task testFull(type: Exec, dependsOn: [testQuick, installDevTest]) {
 }
 
 task cleanPythonCache(type: Exec) {
-  commandLine 'bash', '-x', '-c',
+  commandLine 'bash', '-c',
     "find src -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -o -type d -empty -delete"
 }
 
diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index a4c7ed1037..c3e1e68e16 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -144,8 +144,8 @@ task docGen(type: Exec, dependsOn: [codegen, installDevTest]) {
 
 
 task cleanPythonCache(type: Exec) {
-  commandLine 'bash', '-x', '-c',
-    "find src -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -o -type d -empty -delete"
+  commandLine 'bash', '-c',
+    "find src tests -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -o -type d -empty -delete"
 }
 
 build.dependsOn install
@@ -158,5 +158,8 @@ clean {
   delete 'dist'
   delete 'src/datahub/metadata'
   delete '../docs/generated'
+  delete 'generated'
+  delete '.mypy_cache'
+  delete '.pytest_cache'
 }
 clean.dependsOn cleanPythonCache
diff --git a/metadata-integration/java/datahub-client/build.gradle b/metadata-integration/java/datahub-client/build.gradle
index 0445274336..78ba4e3723 100644
--- a/metadata-integration/java/datahub-client/build.gradle
+++ b/metadata-integration/java/datahub-client/build.gradle
@@ -66,7 +66,6 @@ if (project.hasProperty("releaseVersion")) {
   try {
       // apply this plugin in a try-catch block so that we can handle cases without .git directory
       apply plugin: "com.palantir.git-version"
-      println("In else section")
       def details = versionDetails()
       detailedVersionString = gitVersion()
       version = details.lastTag
diff --git a/metadata-integration/java/spark-lineage/build.gradle b/metadata-integration/java/spark-lineage/build.gradle
index 13765a8aa7..f04878d5bf 100644
--- a/metadata-integration/java/spark-lineage/build.gradle
+++ b/metadata-integration/java/spark-lineage/build.gradle
@@ -30,7 +30,6 @@ if (project.hasProperty("releaseVersion")) {
   try {
       // apply this plugin in a try-catch block so that we can handle cases without .git directory
       apply plugin: "com.palantir.git-version"
-      println("In else section")
       def details = versionDetails()
       detailedVersionString = gitVersion()
       version = details.lastTag