diff --git a/common/.classpath b/common/.classpath
index df9d86de38585f0d17b5a5b65d9d8b2bdbc598c7..59700dbbbd944dfa765184f6912c5462255036aa 100644
--- a/common/.classpath
+++ b/common/.classpath
@@ -28,5 +28,8 @@
 	<classpathentry kind="lib" path="/libraries/jaxb/jsr173_1.0_api.jar"/>
 	<classpathentry kind="lib" path="/libraries/jhdf5/cisd-jhdf5-batteries_included_lin_win_mac.jar" sourcepath="/libraries/jhdf5/cisd-jhdf5-src.zip"/>
 	<classpathentry kind="lib" path="/libraries/classycle/classycle.jar" sourcepath="/libraries/classycle/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/poi/poi-3.7-20101029.jar"/>
+	<classpathentry kind="lib" path="/libraries/poi/poi-ooxml-3.7-20101029.jar"/>
+	<classpathentry kind="lib" path="/libraries/poi/poi-ooxml-schemas-3.7-20101029.jar"/>
 	<classpathentry kind="output" path="targets/classes"/>
 </classpath>
diff --git a/common/build/build.xml b/common/build/build.xml
index 3ad4fbfec2083c7c8e47120d5c4f54cb4e0f794c..3cf525a5dd7d07ea3e8ea00eb0b4064330de9cae 100644
--- a/common/build/build.xml
+++ b/common/build/build.xml
@@ -44,12 +44,6 @@
 			<zipfileset src="${lib}/testng/testng-jdk15.jar" />
 			<zipfileset src="${lib}/commons-lang/commons-lang.jar" />
 			<zipfileset src="${lib}/commons-io/commons-io.jar" />
-			<zipfileset file="${lib}/poi/poi-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
-			<zipfileset file="${lib}/poi/poi-ooxml-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
-			<zipfileset file="${lib}/poi/poi-ooxml-schemas-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
-			<zipfileset file="${lib}/poi/ooxml-lib/dom4j-1.6.1.jar" todir="${dist.datastore_server.lib}" />
-			<zipfileset file="${lib}/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar" todir="${dist.datastore_server.lib}" />
-			<zipfileset file="${lib}/poi/ooxml-lib/xmlbeans-2.3.0.jar" todir="${dist.datastore_server.lib}" />
 			<manifest>
 				<attribute name="Version" value="${version.number}" />
 				<attribute name="Build-Number"