diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 13510f574d..54921e20fd 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -384,69 +384,15 @@ public:
     #include "calculatedFvsPatchField.H"
 #endif
 
-/*
-#define makeFvsPatchTypeFieldTypeName(type)                                    \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(type, 0);
-
-#define makeFvsPatchFieldsTypeName(type)                                       \
-                                                                               \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchScalarField);                      \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchVectorField);                      \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchSphericalTensorField);             \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchSymmTensorField);                  \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchTensorField);
-
-#define makeFvsPatchTypeField(PatchTypeField, typePatchTypeField)              \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                    \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField, typePatchTypeField, patch                                  \
-);                                                                             \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField,                                                            \
-    typePatchTypeField,                                                        \
-    patchMapper                                                                \
-);                                                                             \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField, typePatchTypeField, dictionary                             \
-);
-
-
-#define makeFvsPatchFields(type)                                               \
-                                                                               \
-makeFvsPatchTypeField(fvsPatchScalarField, type##FvsPatchScalarField);         \
-makeFvsPatchTypeField(fvsPatchVectorField, type##FvsPatchVectorField);         \
-makeFvsPatchTypeField                                                          \
-(                                                                              \
-    fvsPatchSphericalTensorField,                                              \
-    type##FvsPatchSphericalTensorField                                         \
-);                                                                             \
-makeFvsPatchTypeField(fvsPatchSymmTensorField, type##FvsPatchSymmTensorField); \
-makeFvsPatchTypeField(fvsPatchTensorField, type##FvsPatchTensorField);
-
-
-#define makeFvsPatchTypeFieldTypedefs(type)                                    \
-                                                                               \
-typedef type##FvsPatchField<scalar> type##FvsPatchScalarField;                 \
-typedef type##FvsPatchField<vector> type##FvsPatchVectorField;                 \
-typedef type##FvsPatchField<sphericalTensor>                                   \
-    type##FvsPatchSphericalTensorField;                                        \
-typedef type##FvsPatchField<symmTensor> type##FvsPatchSymmTensorField;         \
-typedef type##FvsPatchField<tensor> type##FvsPatchTensorField;
-
-*/
-
 
 #define makeFvsPatchField(fvsPatchTypeField)                                   \
                                                                                \
 defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0);                     \
+template<>                                                                     \
+int fvsPatchTypeField::disallowGenericFvsPatchField                            \
+(                                                                              \
+    debug::debugSwitch("disallowGenericFvsPatchField", 0)                      \
+);                                                                             \
 defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch);                 \
 defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper);           \
 defineTemplateRunTimeSelectionTable(fvsPatchTypeField, dictionary);
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
index aaa7deb883..9d5b02c3d0 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,18 +32,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define makeFvsPatchField(fvsPatchTypeField)                                   \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0);                     \
-template<>                                                                     \
-int fvsPatchTypeField::disallowGenericFvsPatchField                            \
-(                                                                              \
-    debug::debugSwitch("disallowGenericFvsPatchField", 0)                      \
-);                                                                             \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch);                 \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper);           \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, dictionary);
-
 makeFvsPatchField(fvsPatchScalarField)
 makeFvsPatchField(fvsPatchVectorField)
 makeFvsPatchField(fvsPatchSphericalTensorField)