diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index dfeae98..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Used as a Web service in the gCube Framework
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index d0b4c39..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-* Massimiliano Assante (massimiliano.assante@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/distro/README b/distro/README
index 9f02f32..35c99c0 100644
--- a/distro/README
+++ b/distro/README
@@ -1,49 +1,67 @@
-The gCube System
-------------------------------------------------------------
-
-This work is partially funded by the European Commission in the
-context of the D4Science project (www.d4science.eu), under the 1st
-call of FP7 IST priority.
-
-
+The gCube System - ${name}
+--------------------------------------------------
+ 
+${description}
+ 
+ 
+${gcube.description}
+ 
+${gcube.funding}
+ 
+ 
+Version
+--------------------------------------------------
+ 
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
+ 
+ 
 Authors
--------
-
-* Valentina Marioli (valentina.marioli@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-  
-* Daniele Strollo (daniele.strollo@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
-
-Version and Release Date
-------------------------
-
-version 1.0.0 (20-05-2010)  
-version 1.2.0 (19-04-2013) 
-
-Description
---------------------
-
-Consists of a gcube service able to properly manage the scheduling and
-the deployment planning of services in a gcube infrastructure.
-
+--------------------------------------------------
+ 
+* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
 
+ 
+ 
+Maintainers
+-----------
+ 
+* Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+ 
+ 
 Download information
---------------------
-
-Source code is available from SVN:
-http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/ResourceBroker/org.gcube.vremanagement.resourcebroker/
-
-Binaries can be downloaded from:
-http://software.d4science.research-infrastructures.eu/
-
+--------------------------------------------------
+ 
+Source code is available from SVN: 
+    ${scm.url}
+ 
+Binaries can be downloaded from the gCube website: 
+   ${gcube.website}
+ 
+ 
+Installation
+--------------------------------------------------
+ 
+Installation documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/
+ 
+ 
 Documentation 
--------------
-VREManager documentation is available on-line from the Projects Documentation Wiki:
-https://gcube.wiki.gcube-system.org/gcube/index.php/Resource_Broker
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/
+    ${gcube.wikiRoot}/
+ 
+Support 
+--------------------------------------------------
+ 
+Bugs and support requests can be reported in the gCube issue tracking tool:
+    ${gcube.issueTracking}
+ 
+ 
 Licensing
----------
-
+--------------------------------------------------
+ 
 This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
-
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index edacb04..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url} 
\ No newline at end of file
diff --git a/src/main/java/org/gcube/common/portal/PortalContext.java b/src/main/java/org/gcube/common/portal/PortalContext.java
index a23d4d4..da0397a 100644
--- a/src/main/java/org/gcube/common/portal/PortalContext.java
+++ b/src/main/java/org/gcube/common/portal/PortalContext.java
@@ -149,8 +149,9 @@ public class PortalContext {
 		return toReturn;
 	}
 	/**
-	 * read the sender (from) email address for notifications name from a property file and returns it
+	 * use org.gcube.vomanagement.usermanagement.impl.LiferayUserManager#getAdmin method
 	 */
+	@Deprecated
 	public String getAdministratorUsername() {
 		//get the portles to look for from the property file
 		Properties props = new Properties();