diff --git a/node-api/build.gradle b/node-api/build.gradle
index 779817a752..8bd131c237 100644
--- a/node-api/build.gradle
+++ b/node-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "2.0.4"
+    id 'com.github.johnrengelman.shadow'
 }
 apply plugin: 'kotlin'
 apply plugin: 'net.corda.plugins.quasar-utils'
diff --git a/node/build.gradle b/node/build.gradle
index bec73872df..42669e0dc6 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -73,9 +73,6 @@ dependencies {
     compile project(':tools:shell')
     compile project(':tools:cliutils')
 
-
-    compile "net.corda.plugins:cordform-common:$gradle_plugins_version"
-
     // Log4J: logging framework (with SLF4J bindings)
     compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
diff --git a/tools/dbmigration/build.gradle b/tools/dbmigration/build.gradle
index ab740ee570..4789d59a99 100644
--- a/tools/dbmigration/build.gradle
+++ b/tools/dbmigration/build.gradle
@@ -1,45 +1,41 @@
-description 'Database Migration Tool'
-
-buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version"
-        classpath 'de.sebastianboegl.gradle.plugins:shadow-log4j-transformer:2.1.1'
-    }
+plugins {
+    id 'de.sebastianboegl.shadow.transformer.log4j' version '2.1.1' apply false
 }
 
+description 'Database Migration Tool'
+
 apply plugin: 'application'
+// We need to set mainClassName before applying the shadow plugin.
+mainClassName = 'com.r3.corda.dbmigration.DBMigration'
+
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'net.corda.plugins.publish-utils'
 apply plugin: 'com.jfrog.artifactory'
 
-mainClassName = 'com.r3.corda.dbmigration.DBMigration'
-
 dependencies {
     compile project(':node')
     // JOpt: for command line flags.
     compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version"
 }
 
+import de.sebastianboegl.gradle.plugins.shadow.transformers.Log4j2PluginsFileTransformer
 shadowJar {
-    transform(de.sebastianboegl.gradle.plugins.shadow.transformers.Log4j2PluginsFileTransformer)
-    archiveName = "database-manager-${version}.jar"
+    transform(Log4j2PluginsFileTransformer)
+    baseName = 'database-manager'
 }
 
 task buildMigrationTool(dependsOn: shadowJar)
+assemble.dependsOn buildMigrationTool
 
 artifacts {
     publish shadowJar {
-        classifier ""
+        classifier = ''
     }
 }
 
 jar {
-    classifier "ignore"
+    classifier 'ignore'
+    enabled = false
 }
 
 publish {