diff --git a/build.gradle b/build.gradle
index 94902efe..e6e7ba47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,13 +17,6 @@ buildscript {
     }
 }
 
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'net.corda.plugins.publish-utils'
-apply plugin: 'net.corda.plugins.cordformation'
-apply plugin: 'net.corda.plugins.quasar-utils'
-apply plugin: 'maven-publish'
-
 repositories {
     mavenLocal()
     jcenter()
@@ -32,6 +25,13 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
+apply plugin: 'java'
+apply plugin: 'idea'
+apply plugin: 'net.corda.plugins.publish-utils'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'maven-publish'
+
 sourceSets {
     main {
         resources {
@@ -49,22 +49,16 @@ dependencies {
     testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
-    compile "net.corda:corda-core:$corda_release_version"
-    compile "net.corda:corda-finance:$corda_release_version"
-    compile "net.corda:corda-jackson:$corda_release_version"
-    compile "net.corda:corda-rpc:$corda_release_version"
-    compile "net.corda:corda-webserver-impl:$corda_release_version"
-    runtime "net.corda:corda:$corda_release_version"
-    runtime "net.corda:corda-webserver:$corda_release_version"
+    cordaCompile "net.corda:corda-core:$corda_release_version"
+    cordaCompile "net.corda:corda-finance:$corda_release_version"
+    cordaCompile "net.corda:corda-jackson:$corda_release_version"
+    cordaCompile "net.corda:corda-rpc:$corda_release_version"
+    cordaCompile "net.corda:corda-webserver-impl:$corda_release_version"
+    cordaRuntime "net.corda:corda:$corda_release_version"
+    cordaRuntime "net.corda:corda-webserver:$corda_release_version"
 
     testCompile "net.corda:corda-test-utils:$corda_release_version"
 
-    // GraphStream: For visualisation (required by TemplateClientRPC app)
-    compile "org.graphstream:gs-core:1.3"
-    compile("org.graphstream:gs-ui:1.3") {
-        exclude group: "bouncycastle"
-    }
-
     // CorDapp dependencies
     // Specify your cordapp's dependencies below, including dependent cordapps
 }