diff --git a/bclib.gradle b/bclib.gradle
index 44d81040..a76e2107 100644
--- a/bclib.gradle
+++ b/bclib.gradle
@@ -8,11 +8,6 @@ buildscript {
     }
 }
 
-
-//archivesBaseName = project.archives_base_name
-//version = project.mod_version
-//group = project.maven_group
-
 apply from: "gradle/bclib-common.gradle"
 
 repositories {
@@ -50,6 +45,7 @@ allprojects {
     }
 
     tasks.withType(JavaCompile).configureEach {
+        options.encoding = "UTF-8"
         it.options.release = 17
     }
 
@@ -72,7 +68,7 @@ allprojects {
     }
 
     loom {
-        // shareRemapCaches = true
+        shareRemapCaches = true
     }
 
     tasks.withType(ProcessResources).configureEach {
@@ -95,13 +91,6 @@ allprojects {
 
 subprojects {
     javadoc.enabled = false
-
-    afterEvaluate {
-        // Disable the gen sources task on sub projects
-//        genCommonSourcesWithCfr.enabled = false
-//        genCommonSourcesWithFernFlower.enabled = false
-//        unpickCommonJar.enabled = false
-    }
 }
 
 javadoc {
@@ -110,7 +99,6 @@ javadoc {
         encoding = "UTF-8"
         charSet = "UTF-8"
         memberLevel = JavadocMemberLevel.PACKAGE
-        // Disable the crazy super-strict doclint tool in Java 8
         addStringOption("Xdoclint:none", "-quiet")
     }
 
diff --git a/gradle/bclib-common.gradle b/gradle/bclib-common.gradle
index b0130672..de702936 100644
--- a/gradle/bclib-common.gradle
+++ b/gradle/bclib-common.gradle
@@ -19,24 +19,6 @@ def moduleDependencies(project, List<String> depNames) {
             api it
         }
     }
-
-//    // As we manually handle the maven artifacts, we need to also manually specify the deps.
-//    project.publishing {
-//        publications {
-//            mavenJava(MavenPublication) {
-//                pom.withXml {
-//                    def depsNode = asNode().appendNode("dependencies")
-//                    deps.each {
-//                        def depNode = depsNode.appendNode("dependency")
-//                        depNode.appendNode("groupId", it.group)
-//                        depNode.appendNode("artifactId", it.name)
-//                        depNode.appendNode("version", it.version)
-//                        depNode.appendNode("scope", "compile")
-//                    }
-//                }
-//            }
-//        }
-//    }
 }
 
 ext {