diff --git a/org.eclipse.gemini.dbaccess.postgresql.feature/feature.xml b/org.eclipse.gemini.dbaccess.postgresql.feature/feature.xml
index c524166..8880e54 100644
--- a/org.eclipse.gemini.dbaccess.postgresql.feature/feature.xml
+++ b/org.eclipse.gemini.dbaccess.postgresql.feature/feature.xml
@@ -4,8 +4,7 @@
       label="%featureName"
       version="1.1.0.qualifier"
       provider-name="%providerName"
-      license-feature="org.eclipse.osbp.license.feature"
-      license-feature-version="0.9.0.qualifier">
+	  plugin="org.eclipse.osbp.license">
 
    <description>
       %description
diff --git a/org.eclipse.osbp.authentication b/org.eclipse.osbp.authentication
deleted file mode 160000
index 2478279..0000000
--- a/org.eclipse.osbp.authentication
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2478279cbdf056594307fc3c81a3645570fbb25d
diff --git a/org.eclipse.osbp.bpm b/org.eclipse.osbp.bpm
deleted file mode 160000
index 39e6925..0000000
--- a/org.eclipse.osbp.bpm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39e692526b38d4577656d963c5fc313496a7c6e4