diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
index ede8be743371530dc414ae07e487f33a046db865..3f8f8d1ad03d443d78ff9d6224eddff9afe5cd22 100644
--- a/cmdline/CMakeLists.txt
+++ b/cmdline/CMakeLists.txt
@@ -35,7 +35,6 @@ include_directories (${CMAKE_SOURCE_DIR}/tapeserver/)
 # Get some extra debug messages on stdout
 #add_definitions(-DXRDSSI_DEBUG)
 
-# XRootD must be compiled with the SSI extensions
 find_package(xrootd REQUIRED)
 find_package(Protobuf3 REQUIRED)
 find_package(cryptopp REQUIRED)
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
index d0edfd645f9aa018a09be91a99bfef8392fff411..cba83c9f5a39a6d55c8dfd94a25a7a82c0cadffe 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
@@ -31,8 +31,7 @@ eoshost=`hostname -f`
 
 EOS_INSTANCE=`hostname -s`
 TAPE_FS_ID=65535
-#CTA_BIN=/usr/bin/cta
-CTA_BIN=/usr/bin/eoscta_stub
+CTA_BIN=/usr/bin/cta
 CTA_KT=/etc/ctafrontend_SSS_c.keytab
 CTA_XrdSecPROTOCOL=sss
 CTA_PROC_DIR=/eos/${EOS_INSTANCE}/proc/cta
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
index 4d5640454bf97d73cea0840d125d5da074d4a1cd..8507c194df9768df0af5c2d17a308b611385d3ed 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 PREPROD_DIR=/eos/ctaeos/preprod
-#CTA_BIN=/usr/bin/cta
-CTA_BIN=/usr/bin/eoscta_stub
+CTA_BIN=/usr/bin/cta
 
 mkdir -p /var/eos/wfe/bash
 cp /opt/ci/ctaeos/var/eos/wfe/bash/* /var/eos/wfe/bash/
diff --git a/eos_wfe_scripts/delete_archive_file b/eos_wfe_scripts/delete_archive_file
index b9302ea0b38f7c0572be9e5519b1f2afc4fadb3f..5cac479efd15bfc2148c7f9829dc2f97b50674dd 100755
--- a/eos_wfe_scripts/delete_archive_file
+++ b/eos_wfe_scripts/delete_archive_file
@@ -16,8 +16,7 @@ if test $# -ne 5; then
   exit ${EINVAL}
 fi
 
-#CTA_BIN=/usr/bin/cta
-CTA_BIN=/usr/bin/eoscta_stub
+CTA_BIN=/usr/bin/cta
 
 WF_TAG="$1"
 RUSERNAME="$2"
diff --git a/eos_wfe_scripts/retrieve_archive_file b/eos_wfe_scripts/retrieve_archive_file
index f038f67130194a12001ce346c85a7af079437b80..434e6d9814cb66e16a187782c8bab656c2ac387b 100755
--- a/eos_wfe_scripts/retrieve_archive_file
+++ b/eos_wfe_scripts/retrieve_archive_file
@@ -16,8 +16,7 @@ if test $# -ne 9; then
   exit ${EINVAL}
 fi
 
-#CTA_BIN=/usr/bin/cta
-CTA_BIN=/usr/bin/eoscta_stub
+CTA_BIN=/usr/bin/cta
 
 WF_TAG="$1"
 RUSERNAME="$2"
diff --git a/xroot_plugins/xrootd-cta.cfg b/xroot_plugins/xrootd-cta.cfg
index 65233a5e43128d3840c1597a607f28e278ca075f..24bf04a2d876dde962782d026e136dc366a5eca1 100644
--- a/xroot_plugins/xrootd-cta.cfg
+++ b/xroot_plugins/xrootd-cta.cfg
@@ -1,5 +1,6 @@
-# Load the SSI + OFS plugins
-xrootd.fslib libXrdSsi.so libXrdCtaOfs.so
+# Load the CTA SSI and OFS plugins
+xrootd.fslib libXrdCtaOfs.so
+#xrootd.fslib libXrdSsi.so libXrdCtaOfs.so
 
 # Specify which paths are handled by the OFS plugin
 #
@@ -14,7 +15,6 @@ ssi.svclib libXrdSsiCta.so
 xrootd.seclib libXrdSec.so
 
 # Protocol specification
-#
 # The xroot server process needs to be able to read the keytab file
 sec.protocol krb5 /etc/krb5.keytab.cta host/<host>@CERN.CH
 sec.protocol sss -s /var/spool/xrootd/.xrd/sss.keytab -c /tmp/sss.keytab
@@ -23,15 +23,27 @@ sec.protocol sss -s /var/spool/xrootd/.xrd/sss.keytab -c /tmp/sss.keytab
 sec.protbind * only sss
 sec.protbind tpsrv* only krb5
 
+# Allow copying from absolute paths
+all.export /
+
+#################################################################
+#
+# TO ACTIVATE SSI:
+# 1. Change the xrootd.fslib line above to include the SSI plugin
+# 2. Remove all.export line above
+# 3. Uncomment all.export lines below
+#
+#################################################################
+
 # Export the SSI resource
-all.export /ctafrontend nolock r/w
+#all.export /ctafrontend nolock r/w
 
 # Export the OFS resource, specified in ssi.fspath above.
 #
 # There can be more than one of these; anything that starts with the prefix
 # will go to the the underlying file system. Note that this prefix cannot be
 # a substring of '/ctafrontend', so it is not possible to simply export '/'.
-all.export /Y3Rh
+#all.export /Y3Rh
 
 # Turn off asynchronous i/o
 xrootd.async off
diff --git a/xroot_rpms/.gitignore b/xroot_rpms/.gitignore
deleted file mode 100644
index 58f287e0eb9fa38cc5122d9e39a21e3f0499e132..0000000000000000000000000000000000000000
--- a/xroot_rpms/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-noarch/
-x86_64/
diff --git a/xroot_rpms/Dockerfile b/xroot_rpms/Dockerfile
deleted file mode 100644
index e42a3c30f9aad6ab3c7478af3c9044f7b4b9f524..0000000000000000000000000000000000000000
--- a/xroot_rpms/Dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-# ******************************************************************************
-#
-# The CERN Tape Archive (CTA) project
-# Copyright (C) 2017  CERN
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# ****************************************************************************/
-
-# Docker image to build XRootD RPMs
-
-# FROM must be the first command in Dockerfile
-
-FROM gitlab-registry.cern.ch/linuxsupport/cc7-base
-
-# Set up default environment
-
-RUN yum clean all && \
-    yum update -y && \
-    yum install -y \
-      ccache \
-      cgdb \
-      cmake \
-      gcc-c++ \
-      gdb \
-      git \
-      ltrace \
-      make \
-      psmisc \
-      rpm-build \
-      strace \
-      sudo \
-      vim \
-      yum-utils
-
-# Check out XRootD from master (includes SSIV2)
-
-RUN git clone https://github.com/xrootd/xrootd.git
-RUN cd xrootd && git pull
-
-# Install all necessary build dependencies
-
-RUN cp xrootd/packaging/rhel/xrootd.spec.in xrootd.spec
-RUN yum-builddep -y xrootd.spec
-
-# Create XRootD source RPM
-
-RUN cd xrootd/packaging && ./makesrpm.sh
-
-# Create final RPMs from the source RPM
-
-RUN rpmbuild --define "_topdir ${PWD}/rpmbuild_xrootd" --rebuild xrootd/packaging/*.src.rpm
-
-# Notes on XRootD version
-#
-# Newer version of CTA requires xroot >= 4.4.1-1
-#
-# epel version is more recent but eos-citrine-depend repo has a higher priority (4) than epel,
-#   so: need to set epel priority to 4:
-#
-#       RUN yum-config-manager --enable epel --setopt="epel.priority=4" 
-#
-#   or: if taking the older version from eos, eos-citrine-depend must be enabled so that the older version of xroot is
-#       installed by cta-cli and is not conflicting later when installing eos...
diff --git a/xroot_rpms/README.md b/xroot_rpms/README.md
deleted file mode 100644
index 6bde6d6ac2c576478fdd969f1735c2c3c66c74d2..0000000000000000000000000000000000000000
--- a/xroot_rpms/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build XRootD RPMs
-
-The XRootD SSI libraries and header files are now integrated into the master branch but are not part
-of any release. As we need to link against the SSI libraries, we need to build our own RPMs:
-```
-./build-rpms
-```
-
diff --git a/xroot_rpms/build_rpms b/xroot_rpms/build_rpms
deleted file mode 100755
index 72f1448cd2943c8c966d1adf4755351bd83303e0..0000000000000000000000000000000000000000
--- a/xroot_rpms/build_rpms
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Ensure Docker is running
-
-HAS_DOCKER=$(ps ax|grep dockerd-current|grep -v grep|wc -l)
-if [ $HAS_DOCKER -eq 0 ]
-then
-  echo -n Starting Docker...
-  sudo systemctl start docker
-  echo done.
-fi
-
-sudo docker build . -f ./Dockerfile -t buildxroot
-
-id=$(sudo docker create buildxroot bash)
-
-echo $id
diff --git a/xroot_rpms/get_rpms b/xroot_rpms/get_rpms
deleted file mode 100755
index 299dbdd939bd443d0b13e631f487998da708247b..0000000000000000000000000000000000000000
--- a/xroot_rpms/get_rpms
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Ensure Docker is running
-
-HAS_DOCKER=$(ps ax|grep dockerd-current|grep -v grep|wc -l)
-if [ $HAS_DOCKER -eq 0 ]
-then
-  echo -n Starting Docker...
-  sudo systemctl start docker
-  echo done.
-fi
-
-sudo docker build . -f ./Dockerfile -t buildxroot
-
-id=$(sudo docker create buildxroot bash)
-
-echo $id
-
-sudo docker cp ${id}:rpmbuild_xrootd/RPMS/noarch/ .
-sudo docker cp ${id}:rpmbuild_xrootd/RPMS/x86_64/ .
-
-# Clean up
-
-sudo docker rm -v ${id}