diff --git a/cavis-full/build.gradle b/cavis-full/build.gradle
index 78f276087..4136e7069 100644
--- a/cavis-full/build.gradle
+++ b/cavis-full/build.gradle
@@ -1,20 +1,9 @@
-import org.gradle.api.internal.artifacts.configurations.Configurations
-
 plugins {
     id 'java-library'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 
-/*
-configurations.archives.artifacts.with { archives ->
-
-    archives.each {
-        println(it.name)
-    }
-}
-*/
-
 dependencies {
     //Todo clean this
     api platform(project(":cavis-common-platform"))
@@ -24,40 +13,26 @@ dependencies {
     api 'org.slf4j:slf4j-api:2.0.3'
     //TODO for the two below.. either platform specific uber jars or a single big one with all platforms
     api group: "org.bytedeco", name: "javacpp", version: "1.5.7", classifier: "linux-x86_64"
-    //api group: "org.bytedeco", name: "javacpp", version: "1.5.7"
-    //api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT', classifier: "linux-x86_64-avx2-cpu"
-    //api group: 'net.brutex.cavis-native', name: 'cavis-native-lib', version: '1.0.0-SNAPSHOT'
+
     rootProject.getAllprojects().each { Project sproj ->
-        if(!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform")
+        if (!sproj.name.equals(name) && !sproj.name.equals("cavis-common-platform")
                 && !sproj.name.equals("Cavis")
                 && !sproj.name.equals("cavis-datavec")
                 && !sproj.name.equals("cavis-dnn")
                 && !sproj.name.equals("cavis-native")
+                && !sproj.name.equals("cavis-native-lib")
                 && !sproj.name.equals("cavis-nd4j")
                 && !sproj.name.equals("cavis-ui")
                 && !sproj.name.equals("cavis-zoo")) {
-            //compileOnly project(""+sproj.path)
-            api sproj
-            sproj.configurations.each { Configuration c ->
-                logger.quiet(sproj.name  + ":" + c.name)
-            }
 
-            if(! sproj.configurations.empty) {
-                //compileOnly project(sproj.getPath())
-
-                /*
-                sproj.configurations.each {Configuration conf ->
-                    conf.dependencies.each {Dependency dep ->
-                        compileOnly dep
-                    }
+            implementation(projects.cavisNative.cavisNativeLib) {
+                capabilities {
+                    it.requireCapability(group: "net.brutex.cavis.cavis-native", name: "cavis-native-lib-cuda-support", version: project.version)
+                    it.requireCapability(group: "net.brutex.cavis.cavis-native", name: "cavis-native-lib-cpu-support", version: project.version)
                 }
-
-                 */
             }
         }
     }
-
-
 }
 
 /*
diff --git a/cavis-native/cavis-native-lib/build.gradle b/cavis-native/cavis-native-lib/build.gradle
index 41e227faa..ac2aa987e 100644
--- a/cavis-native/cavis-native-lib/build.gradle
+++ b/cavis-native/cavis-native-lib/build.gradle
@@ -169,8 +169,6 @@ dependencies {
     implementation "org.apache.commons:commons-lang3"
     implementation "org.apache.commons:commons-math3"
     implementation "com.google.flatbuffers:flatbuffers-java"
-
-    //javacppPlatform project(":cavis-native:cavis-native-blas")
 }