diff --git a/dhp-workflows/dhp-monitor-update/pom.xml b/dhp-workflows/dhp-monitor-update/pom.xml
deleted file mode 100644
index ca0bb9837..000000000
--- a/dhp-workflows/dhp-monitor-update/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- dhp-workflows
- eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
-
- 4.0.0
- dhp-monitor-update
-
-
- org.apache.spark
- spark-core_2.11
-
-
- org.apache.spark
- spark-sql_2.11
-
-
-
-
-
- pl.project13.maven
- git-commit-id-plugin
- 2.1.11
-
- false
-
-
-
-
-
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/config-default.xml b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/config-default.xml
deleted file mode 100644
index 63fc84d75..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/config-default.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- jobTracker
- ${jobTracker}
-
-
- nameNode
- ${nameNode}
-
-
- oozie.use.system.libpath
- true
-
-
- oozie.action.sharelib.for.spark
- spark2
-
-
- hive_metastore_uris
- thrift://iis-cdh5-test-m3.ocean.icm.edu.pl:9083
-
-
- hive_jdbc_url
- jdbc:hive2://iis-cdh5-test-m3.ocean.icm.edu.pl:10000/;UseNativeQuery=1;?spark.executor.memory=19166291558;spark.yarn.executor.memoryOverhead=3225;spark.driver.memory=11596411699;spark.yarn.driver.memoryOverhead=1228
-
-
- oozie.wf.workflow.notification.url
- {serviceUrl}/v1/oozieNotification/jobUpdate?jobId=$jobId%26status=$status
-
-
- stats_tool_api_url
- ${stats_tool_api_url}
-
-
\ No newline at end of file
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/copyDataToImpalaCluster.sh b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/copyDataToImpalaCluster.sh
deleted file mode 100644
index c05d8342a..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/copyDataToImpalaCluster.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-export PYTHON_EGG_CACHE=/home/$(whoami)/.python-eggs
-export link_folder=/tmp/impala-shell-python-egg-cache-$(whoami)
-if ! [ -L $link_folder ]
-then
- rm -Rf "$link_folder"
- ln -sfn ${PYTHON_EGG_CACHE}${link_folder} ${link_folder}
-fi
-
-#export HADOOP_USER_NAME="dimitris.pierrakos"
-export HADOOP_USER_NAME=$2
-
-function copydb() {
- db=$1
-
- # copy the databases from ocean to impala
-
- echo "copying $db"
- hadoop distcp -Dmapreduce.map.memory.mb=6144 -pb hdfs://nameservice1/user/hive/warehouse/${db}.db hdfs://impala-cluster-mn1.openaire.eu:8020/tmp
-
- # change ownership to impala
- hdfs dfs -conf /etc/impala_cluster/hdfs-site.xml -chmod -R 777 /tmp/${db}.db
-
- # create the databases
- impala-shell -i impala-cluster-dn1.openaire.eu -q "drop database if exists ${db} cascade";
- impala-shell -i impala-cluster-dn1.openaire.eu -q "create database ${db}";
-
- impala-shell -q "INVALIDATE METADATA"
- echo "creating schema for ${db}"
- for i in `impala-shell -d ${db} --delimited -q "show tables"`;
- do
- impala-shell -d ${db} --delimited -q "show create table $i";
- done | sed 's/"$/;/' | sed 's/^"//' | sed 's/[[:space:]]\date[[:space:]]/`date`/g' | impala-shell -i impala-cluster-dn1.openaire.eu -c -f -
-
- # run the same command twice because we may have failures in the first run (due to views pointing to the same db)
- for i in `impala-shell -d ${db} --delimited -q "show tables"`;
- do
- impala-shell -d ${db} --delimited -q "show create table $i";
- done | sed 's/"$/;/' | sed 's/^"//' | sed 's/[[:space:]]\date[[:space:]]/`date`/g' | impala-shell -i impala-cluster-dn1.openaire.eu -c -f -
-
- # load the data from /tmp in the respective tables
- echo "copying data in tables and computing stats"
- for i in `impala-shell -i impala-cluster-dn1.openaire.eu -d ${db} --delimited -q "show tables"`;
- do
- impala-shell -i impala-cluster-dn1.openaire.eu -d ${db} -q "load data inpath '/tmp/${db}.db/$i' into table $i";
- impala-shell -i impala-cluster-dn1.openaire.eu -d ${db} -q "compute stats $i";
- done
-
- # deleting the remaining directory from hdfs
- hdfs dfs -conf /etc/impala_cluster/hdfs-site.xml -rm -R /tmp/${db}.db
-}
-
-MONITOR_DB=$1
-HADOOP_USER_NAME=$2
-
-copydb $MONITOR_DB
-
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/finalizeImpalaCluster.sh b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/finalizeImpalaCluster.sh
deleted file mode 100644
index 46eaba6d0..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/finalizeImpalaCluster.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-export PYTHON_EGG_CACHE=/home/$(whoami)/.python-eggs
-export link_folder=/tmp/impala-shell-python-egg-cache-$(whoami)
-if ! [ -L $link_folder ]
-then
- rm -Rf "$link_folder"
- ln -sfn ${PYTHON_EGG_CACHE}${link_folder} ${link_folder}
-fi
-
-function createShadowDB() {
- SOURCE=$1
- SHADOW=$2
-
- impala-shell -i impala-cluster-dn1.openaire.eu -q "drop database ${SHADOW} CASCADE";
- impala-shell -i impala-cluster-dn1.openaire.eu -q "create database if not exists ${SHADOW}";
-# impala-shell -i impala-cluster-dn1.openaire.eu -d ${SHADOW} -q "show tables" | sed "s/^/drop view if exists ${SHADOW}./" | sed "s/$/;/" | impala-shell -i impala-cluster-dn1.openaire.eu -f -
- impala-shell -i impala-cluster-dn1.openaire.eu -d ${SOURCE} -q "show tables" --delimited | sed "s/\(.*\)/create view ${SHADOW}.\1 as select * from ${SOURCE}.\1;/" | impala-shell -i impala-cluster-dn1.openaire.eu -f -
-}
-
-MONITOR_DB=$3
-MONITOR_DB_SHADOW=$4
-
-createShadowDB $MONITOR_DB $MONITOR_DB_SHADOW
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor-post.sh b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor-post.sh
deleted file mode 100644
index 5863625a1..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor-post.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_EGG_CACHE=/home/$(whoami)/.python-eggs
-export link_folder=/tmp/impala-shell-python-egg-cache-$(whoami)
-if ! [ -L $link_folder ]
-then
- rm -Rf "$link_folder"
- ln -sfn ${PYTHON_EGG_CACHE}${link_folder} ${link_folder}
-fi
-
-export SOURCE=$1
-export SHADOW=$2
-export HIVE_OPTS="-hiveconf mapred.job.queue.name=analytics -hiveconf hive.spark.client.connect.timeout=120000ms -hiveconf hive.spark.client.server.connect.timeout=300000ms -hiveconf spark.executor.memory=19166291558 -hiveconf spark.yarn.executor.memoryOverhead=3225 -hiveconf spark.driver.memory=11596411699 -hiveconf spark.yarn.driver.memoryOverhead=1228"
-export HADOOP_USER_NAME="oozie"
-
-echo "Updating shadow database"
-hive -e "drop database if exists ${SHADOW} cascade"
-hive -e "create database if not exists ${SHADOW}"
-hive $HIVE_OPTS --database ${SOURCE} -e "show tables" | grep -v WARN | sed "s/\(.*\)/create view ${SHADOW}.\1 as select * from ${SOURCE}.\1;/" > foo
-hive -f foo
-echo "Updated shadow database"
\ No newline at end of file
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh
deleted file mode 100644
index 56681dc62..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/monitor.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-export PYTHON_EGG_CACHE=/home/$(whoami)/.python-eggs
-export link_folder=/tmp/impala-shell-python-egg-cache-$(whoami)
-if ! [ -L $link_folder ]
-then
- rm -Rf "$link_folder"
- ln -sfn ${PYTHON_EGG_CACHE}${link_folder} ${link_folder}
-fi
-
-export SOURCE=$1
-export TARGET=$2
-export SCRIPT_PATH=$3
-
-export HIVE_OPTS="-hiveconf mapred.job.queue.name=analytics -hiveconf hive.spark.client.connect.timeout=120000ms -hiveconf hive.spark.client.server.connect.timeout=300000ms -hiveconf spark.executor.memory=19166291558 -hiveconf spark.yarn.executor.memoryOverhead=3225 -hiveconf spark.driver.memory=11596411699 -hiveconf spark.yarn.driver.memoryOverhead=1228"
-export HADOOP_USER_NAME="oozie"
-
-echo "Getting file from " $SCRIPT_PATH
-hdfs dfs -copyToLocal $SCRIPT_PATH
-
-echo "Creating monitor database"
-cat createMonitorDB.sql | sed "s/TARGET/${TARGET}/g" | sed "s/SOURCE/${SOURCE}/g" > foo
-hive $HIVE_OPTS -f foo
-echo "Hive shell finished"
\ No newline at end of file
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql
deleted file mode 100644
index 257cb1419..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/scripts/createMonitorDB.sql
+++ /dev/null
@@ -1,266 +0,0 @@
-DROP TABLE IF EXISTS TARGET.result_new;
-
-create table TARGET.result_new stored as parquet as
- select distinct * from (
- select * from SOURCE.result r where exists (select 1 from SOURCE.result_organization ro where ro.id=r.id and ro.organization in (
- 'openorgs____::38d7097854736583dde879d12dacafca' -- Brown University
- ) )) foo;
-
-ANALYZE TABLE TARGET.result_new COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result select * from TARGET.result_new;
-
-INSERT INTO TARGET.result_citations select * from TARGET.result_citations orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_citations COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_references_oc select * from TARGET.result_references_oc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_references_oc COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_citations_oc select * from TARGET.result_citations_oc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_citations_oc COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_classifications select * from TARGET.result_classifications orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_classifications COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_apc select * from TARGET.result_apc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_apc COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_concepts select * from TARGET.result_concepts orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_concepts COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_datasources select * from TARGET.result_datasources orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_datasources COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_fundercount select * from TARGET.result_fundercount orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_fundercount COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_gold select * from TARGET.result_gold orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_gold COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_greenoa select * from TARGET.result_greenoa orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_greenoa COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_languages select * from TARGET.result_languages orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_languages COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_licenses select * from TARGET.result_licenses orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_licenses COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_oids select * from TARGET.result_oids orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_oids COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_organization select * from TARGET.result_organization orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_organization COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_peerreviewed select * from TARGET.result_peerreviewed orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_peerreviewed COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_pids select * from TARGET.result_pids orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_pids COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_projectcount select * from TARGET.result_projectcount orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_projectcount COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_projects select * from TARGET.result_projects orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_projects COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_refereed select * from TARGET.result_refereed orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_refereed COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_sources select * from TARGET.result_sources orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_sources COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_topics select * from TARGET.result_topics orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_topics COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result_fos select * from TARGET.result_fos orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.result_fos COMPUTE STATISTICS;
-
-INSERT INTO TARGET.result select * from TARGET.result_new;
-COMPUTE STATS TARGET.result;
-
-INSERT INTO TARGET.result_citations select * from TARGET.result_citations orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_citations;
-
-INSERT INTO TARGET.result_references_oc select * from TARGET.result_references_oc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_references_oc;
-
-INSERT INTO TARGET.result_citations_oc select * from TARGET.result_citations_oc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_citations_oc;
-
-INSERT INTO TARGET.result_classifications select * from TARGET.result_classifications orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_classifications;
-
-INSERT INTO TARGET.result_apc select * from TARGET.result_apc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_apc;
-
-INSERT INTO TARGET.result_concepts select * from TARGET.result_concepts orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_concepts;
-
-INSERT INTO TARGET.result_datasources select * from TARGET.result_datasources orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_datasources;
-
-INSERT INTO TARGET.result_fundercount select * from TARGET.result_fundercount orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_fundercount;
-
-INSERT INTO TARGET.result_gold select * from TARGET.result_gold orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_gold;
-
-INSERT INTO TARGET.result_greenoa select * from TARGET.result_greenoa orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_greenoa;
-
-INSERT INTO TARGET.result_languages select * from TARGET.result_languages orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_languages;
-
-INSERT INTO TARGET.result_licenses select * from TARGET.result_licenses orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_licenses;
-
-INSERT INTO TARGET.result_oids select * from TARGET.result_oids orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_oids;
-
-INSERT INTO TARGET.result_organization select * from TARGET.result_organization orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_organization;
-
-INSERT INTO TARGET.result_peerreviewed select * from TARGET.result_peerreviewed orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_peerreviewed;
-
-INSERT INTO TARGET.result_pids select * from TARGET.result_pids orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_pids;
-
-INSERT INTO TARGET.result_projectcount select * from TARGET.result_projectcount orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_projectcount;
-
-INSERT INTO TARGET.result_projects select * from TARGET.result_projects orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_projects;
-
-INSERT INTO TARGET.result_refereed select * from TARGET.result_refereed orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_refereed;
-
-INSERT INTO TARGET.result_sources select * from TARGET.result_sources orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_sources;
-
-INSERT INTO TARGET.result_topics select * from TARGET.result_topics orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.result_topics;
-
-INSERT INTO TARGET.result_fos select * from TARGET.result_fos orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-
-create view TARGET.foo1 as select * from TARGET.result_result rr where rr.source in (select id from TARGET.result_new);
-create view TARGET.foo2 as select * from TARGET.result_result rr where rr.target in (select id from TARGET.result_new);
-INSERT INTO TARGET.result_result select distinct * from (select * from TARGET.foo1 union all select * from TARGET.foo2) foufou;
-drop view TARGET.foo1;
-drop view TARGET.foo2;
-
-ANALYZE TABLE TARGET.result_result COMPUTE STATISTICS;
-
-
--- indicators
--- Sprint 1 ----
-INSERT INTO TARGET.indi_pub_green_oa select * from TARGET.indi_pub_green_oa orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_green_oa COMPUTE STATISTICS;
-
-INSERT INTO TARGET.indi_pub_grey_lit select * from TARGET.indi_pub_grey_lit orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_grey_lit COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_doi_from_crossref select * from TARGET.indi_pub_doi_from_crossref orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_doi_from_crossref COMPUTE STATISTICS;
--- Sprint 2 ----
-INSERT INTO TARGET.indi_result_has_cc_licence select * from TARGET.indi_result_has_cc_licence orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_result_has_cc_licence COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_result_has_cc_licence_url select * from TARGET.indi_result_has_cc_licence_url orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_result_has_cc_licence_url COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_has_abstract select * from TARGET.indi_pub_has_abstract orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_has_abstract COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_result_with_orcid select * from TARGET.indi_result_with_orcid orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_result_with_orcid COMPUTE STATISTICS;
----- Sprint 3 ----
-INSERT INTO TARGET.indi_funded_result_with_fundref select * from TARGET.indi_funded_result_with_fundref orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_funded_result_with_fundref COMPUTE STATISTICS;
----- Sprint 4 ----
-INSERT INTO TARGET.indi_pub_diamond select * from TARGET.indi_pub_diamond orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_diamond COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_in_transformative select * from TARGET.indi_pub_in_transformative orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_in_transformative COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_closed_other_open select * from TARGET.indi_pub_closed_other_open orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_closed_other_open COMPUTE STATISTICS;
----- Sprint 5 ----
-INSERT INTO TARGET.indi_result_no_of_copies select * from TARGET.indi_result_no_of_copies orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_result_no_of_copies COMPUTE STATISTICS;
----- Sprint 6 ----
-INSERT INTO TARGET.indi_pub_hybrid_oa_with_cc select * from TARGET.indi_pub_hybrid_oa_with_cc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_hybrid_oa_with_cc COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_downloads select * from TARGET.indi_pub_downloads orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-ANALYZE TABLE TARGET.indi_pub_downloads COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_downloads_datasource select * from TARGET.indi_pub_downloads_datasource orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-ANALYZE TABLE TARGET.indi_pub_downloads_datasource COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_downloads_year select * from TARGET.indi_pub_downloads_year orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-ANALYZE TABLE TARGET.indi_pub_downloads_year COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_downloads_datasource_year select * from TARGET.indi_pub_downloads_datasource_year orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-ANALYZE TABLE TARGET.indi_pub_downloads_datasource_year COMPUTE STATISTICS;
----- Sprint 7 ----
-INSERT INTO TARGET.indi_pub_gold_oa select * from TARGET.indi_pub_gold_oa orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_gold_oa COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_hybrid select * from TARGET.indi_pub_hybrid orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_hybrid COMPUTE STATISTICS;
-
-INSERT INTO TARGET.indi_pub_has_preprint select * from TARGET.indi_pub_has_preprint orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_has_preprint COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_pub_in_subscribed select * from TARGET.indi_pub_in_subscribed orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_pub_in_subscribed COMPUTE STATISTICS;
-INSERT INTO TARGET.indi_result_with_pid select * from TARGET.indi_result_with_pid orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-ANALYZE TABLE TARGET.indi_result_with_pid COMPUTE STATISTICS;
-=======
-COMPUTE STATS TARGET.indi_pub_green_oa;
-INSERT INTO TARGET.indi_pub_grey_lit select * from TARGET.indi_pub_grey_lit orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_grey_lit;
-INSERT INTO TARGET.indi_pub_doi_from_crossref select * from TARGET.indi_pub_doi_from_crossref orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_doi_from_crossref;
--- Sprint 2 ----
-INSERT INTO TARGET.indi_result_has_cc_licence select * from TARGET.indi_result_has_cc_licence orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_result_has_cc_licence;
-INSERT INTO TARGET.indi_result_has_cc_licence_url select * from TARGET.indi_result_has_cc_licence_url orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_result_has_cc_licence_url;
-INSERT INTO TARGET.indi_pub_has_abstract select * from TARGET.indi_pub_has_abstract orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_has_abstract;
-INSERT INTO TARGET.indi_result_with_orcid select * from TARGET.indi_result_with_orcid orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_result_with_orcid;
----- Sprint 3 ----
-INSERT INTO TARGET.indi_funded_result_with_fundref select * from TARGET.indi_funded_result_with_fundref orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_funded_result_with_fundref;
----- Sprint 4 ----
-INSERT INTO TARGET.indi_pub_diamond select * from TARGET.indi_pub_diamond orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_diamond;
-INSERT INTO TARGET.indi_pub_in_transformative select * from TARGET.indi_pub_in_transformative orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_in_transformative;
-INSERT INTO TARGET.indi_pub_closed_other_open select * from TARGET.indi_pub_closed_other_open orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_closed_other_open;
----- Sprint 5 ----
-INSERT INTO TARGET.indi_result_no_of_copies select * from TARGET.indi_result_no_of_copies orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_result_no_of_copies;
----- Sprint 6 ----
-INSERT INTO TARGET.indi_pub_hybrid_oa_with_cc select * from TARGET.indi_pub_hybrid_oa_with_cc orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_hybrid_oa_with_cc;
-INSERT INTO TARGET.indi_pub_downloads select * from TARGET.indi_pub_downloads orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-COMPUTE STATS TARGET.indi_pub_downloads;
-INSERT INTO TARGET.indi_pub_downloads_datasource select * from TARGET.indi_pub_downloads_datasource orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-COMPUTE STATS TARGET.indi_pub_downloads_datasource;
-INSERT INTO TARGET.indi_pub_downloads_year select * from TARGET.indi_pub_downloads_year orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-COMPUTE STATS TARGET.indi_pub_downloads_year;
-INSERT INTO TARGET.indi_pub_downloads_datasource_year select * from TARGET.indi_pub_downloads_datasource_year orig where exists (select 1 from TARGET.result_new r where r.id=orig.result_id);
-COMPUTE STATS TARGET.indi_pub_downloads_datasource_year;
----- Sprint 7 ----
-INSERT INTO TARGET.indi_pub_gold_oa select * from TARGET.indi_pub_gold_oa orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_gold_oa;
-INSERT INTO TARGET.indi_pub_hybrid select * from TARGET.indi_pub_hybrid orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_hybrid;
-
-INSERT INTO TARGET.indi_pub_has_preprint select * from TARGET.indi_pub_has_preprint orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_has_preprint;
-INSERT INTO TARGET.indi_pub_in_subscribed select * from TARGET.indi_pub_in_subscribed orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_pub_in_subscribed;
-INSERT INTO TARGET.indi_result_with_pid select * from TARGET.indi_result_with_pid orig where exists (select 1 from TARGET.result_new r where r.id=orig.id);
-COMPUTE STATS TARGET.indi_result_with_pid;
-
---create table TARGET.indi_datasets_gold_oa stored as parquet as select * from SOURCE.indi_datasets_gold_oa orig where exists (select 1 from TARGET.result r where r.id=orig.id);
---compute stats TARGET.indi_datasets_gold_oa;
---create table TARGET.indi_software_gold_oa stored as parquet as select * from SOURCE.indi_software_gold_oa orig where exists (select 1 from TARGET.result r where r.id=orig.id);
---compute stats TARGET.indi_software_gold_oa;
-DROP TABLE TARGET.result_new;
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/updateCache.sh b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/updateCache.sh
deleted file mode 100644
index 03aa535e1..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/updateCache.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-curl --request GET $1/cache/updateCache
-sleep 6h
\ No newline at end of file
diff --git a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml b/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml
deleted file mode 100644
index 651b6fa13..000000000
--- a/dhp-workflows/dhp-monitor-update/src/main/resources/eu/dnetlib/dhp/oa/graph/monitor/oozie_app/workflow.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
- stats_db_name
- the target stats database name
-
-
- stats_db_shadow_name
- the name of the shadow schema
-
-
- monitor_db_name
- the target monitor db name
-
-
- monitor_db_shadow_name
- the name of the shadow monitor db
-
-
- stats_tool_api_url
- The url of the API of the stats tool. Is used to trigger the cache update.
-
-
- hive_metastore_uris
- hive server metastore URIs
-
-
- hive_jdbc_url
- hive server jdbc url
-
-
- hive_timeout
- the time period, in seconds, after which Hive fails a transaction if a Hive client has not sent a hearbeat. The default value is 300 seconds.
-
-
- context_api_url
- the base url of the context api (https://services.openaire.eu/openaire)
-
-
-
-
- ${jobTracker}
- ${nameNode}
-
-
- hive.metastore.uris
- ${hive_metastore_uris}
-
-
- hive.txn.timeout
- ${hive_timeout}
-
-
-
-
-
-
-
- Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]
-
-
-
-
- ${jobTracker}
- ${nameNode}
- monitor.sh
- ${stats_db_name}
- ${monitor_db_name}
- ${wf:appPath()}/scripts/createMonitorDB.sql
- monitor.sh
-
-
-
-
-
-
-
-
- ${jobTracker}
- ${nameNode}
- monitor-post.sh
- ${stats_db_name}
- ${monitor_db_name}
- ${monitor_db_shadow_name}
- monitor-post.sh
-
-
-
-
-
-
-
- ${jobTracker}
- ${nameNode}
- copyDataToImpalaCluster.sh
- ${monitor_db_name}
- ${hadoop_user_name}
- copyDataToImpalaCluster.sh
-
-
-
-
-
-
-
- ${jobTracker}
- ${nameNode}
- finalizeImpalaCluster.sh
- ${monitor_db_name}
- ${monitor_db_shadow_name}
- finalizeImpalaCluster.sh
-
-
-
-
-
-
-
- ${jobTracker}
- ${nameNode}
- updateCache.sh
- ${stats_tool_api_url}
- updateCache.sh
-
-
-
-
-
-
\ No newline at end of file