diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 94d80dea5c..c73c87040a 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -223,7 +223,6 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
-#ifndef NoConstructFromTmp
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
@@ -234,7 +233,6 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {
     tdf.clear();
 }
-#endif
 
 
 template<class Type, class GeoMesh>
@@ -279,7 +277,6 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
-#ifndef NoConstructFromTmp
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
@@ -291,7 +288,6 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {
     tdf.clear();
 }
-#endif
 
 
 template<class Type, class GeoMesh>
@@ -336,7 +332,6 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
-#ifndef NoConstructFromTmp
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
@@ -348,7 +343,6 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {
     tdf.clear();
 }
-#endif
 
 
 template<class Type, class GeoMesh>
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 6bebd04c8b..2c53398f26 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -211,12 +211,10 @@ public:
         DimensionedField(DimensionedField<Type, GeoMesh>& df, bool reuse);
 
         //- Construct from tmp\<DimensionedField\> deleting argument
-        #ifndef NoConstructFromTmp
         DimensionedField
         (
             const tmp<DimensionedField<Type, GeoMesh>>& tdf
         );
-        #endif
 
         //- Copy construct, resetting IO parameters
         DimensionedField
@@ -242,13 +240,11 @@ public:
 
         //- Construct from tmp\<DimensionedField\> deleting argument,
         //- resetting IO parameters.
-        #ifndef NoConstructFromTmp
         DimensionedField
         (
             const IOobject& io,
             const tmp<DimensionedField<Type, GeoMesh>>& tdf
         );
-        #endif
 
         //- Copy construct with a new name
         DimensionedField
@@ -273,13 +269,11 @@ public:
         );
 
         //- Construct with a new name from tmp\<DimensionedField\>
-        #ifndef NoConstructFromTmp
         DimensionedField
         (
             const word& newName,
             const tmp<DimensionedField<Type, GeoMesh>>& tdf
         );
-        #endif
 
         //- Clone
         tmp<DimensionedField<Type, GeoMesh>> clone() const;
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index f25bb86749..9d26f127eb 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -166,7 +166,6 @@ FieldField<Field, Type>::FieldField(PtrList<Field<Type>>&& list)
 {}
 
 
-#ifndef NoConstructFromTmp
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
 :
@@ -174,7 +173,6 @@ FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
 {
     tf.clear();
 }
-#endif
 
 
 template<template<class> class Field, class Type>
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 66607446c6..be956394d0 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -112,9 +112,7 @@ public:
         FieldField(PtrList<Field<Type>>&& list);
 
         //- Move/copy construct from tmp<FieldField>
-        #ifndef NoConstructFromTmp
         FieldField(const tmp<FieldField<Field, Type>>& tf);
-        #endif
 
         //- Construct from Istream
         FieldField(Istream& is);
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index ae4f2bfcdb..a0f134309e 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -219,9 +219,7 @@ public:
         inline Field(Field<Type>& fld, bool reuse);
 
         //- Copy or move construct from tmp
-        #ifndef NoConstructFromTmp
         inline Field(const tmp<Field<Type>>& tfld);
-        #endif
 
         //- Construct from Istream
         inline Field(Istream& is);
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldI.H b/src/OpenFOAM/fields/Fields/Field/FieldI.H
index 987d647c6a..f6a9ed15cf 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldI.H
@@ -109,7 +109,6 @@ inline Foam::Field<Type>::Field(Field<Type>& fld, bool reuse)
 {}
 
 
-#ifndef NoConstructFromTmp
 template<class Type>
 inline Foam::Field<Type>::Field(const tmp<Field<Type>>& tfld)
 :
@@ -117,7 +116,6 @@ inline Foam::Field<Type>::Field(const tmp<Field<Type>>& tfld)
 {
     tfld.clear();
 }
-#endif
 
 
 template<class Type>
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 8e5d875e1b..f01bfec544 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -467,7 +467,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
-#ifndef NoConstructFromTmp
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
@@ -487,7 +486,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     tgf.clear();
 }
-#endif
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -518,7 +516,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
-#ifndef NoConstructFromTmp
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
@@ -540,7 +537,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     readIfPresent();
 }
-#endif
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -571,7 +567,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
-#ifndef NoConstructFromTmp
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
@@ -591,7 +586,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     tgf.clear();
 }
-#endif
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -663,7 +657,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
-#ifndef NoConstructFromTmp
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
@@ -693,7 +686,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     tgf.clear();
 }
-#endif
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 78ed4ff625..5226c1c4f9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -397,12 +397,10 @@ public:
         );
 
         //- Construct from tmp\<GeometricField\> deleting argument
-        #ifndef NoConstructFromTmp
         GeometricField
         (
             const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
         );
-        #endif
 
         //- Construct as copy resetting IO parameters
         GeometricField
@@ -412,13 +410,11 @@ public:
         );
 
         //- Construct as copy of tmp<GeometricField> resetting IO parameters
-        #ifndef NoConstructFromTmp
         GeometricField
         (
             const IOobject& io,
             const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
         );
-        #endif
 
         //- Copy construct with a new name
         GeometricField
@@ -428,13 +424,11 @@ public:
         );
 
         //- Construct with a new name from tmp\<GeometricField\>
-        #ifndef NoConstructFromTmp
         GeometricField
         (
             const word& newName,
             const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
         );
-        #endif
 
         //- Construct as copy resetting IO parameters and patch type
         GeometricField
@@ -454,7 +448,6 @@ public:
         );
 
         //- Construct as copy resetting IO parameters and boundary types
-        #ifndef NoConstructFromTmp
         GeometricField
         (
             const IOobject& io,
@@ -462,7 +455,6 @@ public:
             const wordList& patchFieldTypes,
             const wordList& actualPatchTypes = wordList()
         );
-        #endif
 
         //- Clone
         tmp<GeometricField<Type, PatchField, GeoMesh>> clone() const;
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index aaf2e09d40..fb0887444d 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -347,7 +347,6 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
 }
 
 
-#ifndef NoConstructFromTmp
 template<class Type>
 Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 :
@@ -400,7 +399,6 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 
     tfvm.clear();
 }
-#endif
 
 
 template<class Type>
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 1acbb4300e..715722ea59 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -54,7 +54,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 
 template<class Type>
 class fvMatrix;
@@ -263,9 +263,7 @@ public:
         fvMatrix(const fvMatrix<Type>&);
 
         //- Construct as copy of tmp<fvMatrix<Type>> deleting argument
-        #ifndef NoConstructFromTmp
         fvMatrix(const tmp<fvMatrix<Type>>&);
-        #endif
 
         //- Construct from Istream given field to solve for
         fvMatrix(const GeometricField<Type, fvPatchField, volMesh>&, Istream&);