diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
deleted file mode 100644
index 44ccddf759..0000000000
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ /dev/null
@@ -1,224 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
- | Copyright (C) 2011-2016 OpenFOAM Foundation
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM 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.
-
- OpenFOAM 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 OpenFOAM. If not, see .
-
-Class
- Foam::Xfer
-
-Description
- A simple container for copying or transferring objects of type \.
-
- The wrapped object of type \ must implement a transfer() method and
- an operator=() copy method.
-
-\deprecated(2018-03) This class is an artifact from pre-C++11 code.
-
-Note
- This class is an artifact from pre-C++11 code, where it was used
- as a workaround for the lack of movable references (rvalue).
- The interfaces previously using Xfer to reclaim memory now use
- movable references directly or, in the rare case, an autoPtr.
-
-See also
- xferCopy, xferCopyTo, xferMove, xferMoveTo
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Xfer_H
-#define Xfer_H
-
-#include "nullObject.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class Xfer Declaration
-\*---------------------------------------------------------------------------*/
-
-template
-class Xfer
-{
- // Private data
-
- //- Pointer to underlying datatype
- mutable T* ptr_;
-
-
-public:
-
- // STL type definition similar to std::shared_ptr
-
- //- Type of object being managed
- typedef T element_type;
-
-
- // Constructors
-
- //- Construct with no managed object.
- inline constexpr Xfer() noexcept : ptr_(nullptr)
- {}
-
- //- Store object pointer and manage its deletion
- // Can also be used later to transfer by assignment
- inline explicit Xfer(T* p) noexcept : ptr_(p)
- {}
-
- //- Move construct, transferring ownership
- inline Xfer(const Xfer& xf) noexcept : ptr_(xf.ptr_)
- {
- xf.ptr_ = nullptr;
- }
-
-
- //- Destructor
- inline ~Xfer() noexcept
- {
- delete ptr_;
- ptr_ = nullptr;
- }
-
-
- // Static Member Functions
-
- //- Return a null object reference
- inline static const Xfer& null()
- {
- return NullObjectRef>();
- }
-
-
- // Member Functions
-
- //- Test for valid pointer
- inline bool valid() const noexcept { return ptr_; }
-
- //- Pointer to the underlying object.
- inline T* get() const noexcept { return ptr_; }
-
- //- Rvalue reference to the underlying object.
- inline T&& rvalue() const { return std::move(*ptr_); }
-
- //- Swaps the managed objects
- inline void swap(Xfer& other) noexcept
- {
- T* p = ptr_;
- ptr_ = other.ptr_;
- other.ptr_ = p;
- }
-
-
- // Member Operators
-
- //- Reference to the underlying object
- inline T& operator*() const { return *ptr_; }
-
- //- Pointer to the underlying object
- inline T* operator->() const { return ptr_; }
-
- //- Reference to the underlying object
- inline T& operator()() const { return *ptr_; }
-
- //- Move assignment, transferring ownership
- inline void operator=(const Xfer& rhs) noexcept
- {
- if (this != &rhs)
- {
- // clear and swap
- delete ptr_;
- ptr_ = rhs.ptr_;
- rhs.ptr_ = nullptr;
- }
- }
-};
-
-
-// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
-
-
-//- Copy construct contents of the \a obj
-// \deprecated - Xfer should not be used in new code
-// \sa xferCopyTo, xferMove, xferMoveTo and Foam::Xfer
-template
-inline Xfer xferCopy(const T& obj)
-{
- return Foam::Xfer(new T(obj));
-}
-
-
-//- Transfer construct contents of the \a obj
-// \deprecated - Xfer should not be used in new code
-//
-// \sa xferCopy, xferCopyTo, xferMoveTo and Foam::Xfer
-template
-inline Xfer xferMove(T& obj)
-{
- T* ptr = new T;
- ptr->transfer(obj);
- return Foam::Xfer(ptr);
-}
-
-
-//- Copy construct contents of the \a obj from dissimilar type
-// \deprecated - Xfer should not be used in new code
-//
-// \sa xferCopy, xferMove, xferMoveTo and Foam::Xfer
-template
-inline Xfer xferCopyTo(const From& obj)
-{
- return Foam::Xfer(new T(obj));
-}
-
-
-//- Transfer construct contents of the \a obj from dissimilar type
-// \deprecated - Xfer should not be used in new code
-//
-// \par Example Use
-// \code
-// DynamicList