diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index e3d4d2e242..400a2dcdbc 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -665,10 +665,8 @@ $(Fields)/labelField/labelFieldIOField.C
 $(Fields)/scalarField/scalarField.C
 $(Fields)/scalarField/scalarIOField.C
 $(Fields)/scalarField/scalarFieldIOField.C
-$(Fields)/vectorField/vectorField.C
 $(Fields)/vectorField/vectorIOField.C
 $(Fields)/vectorField/vectorFieldIOField.C
-$(Fields)/vector2DField/vector2DField.C
 $(Fields)/vector2DField/vector2DIOField.C
 $(Fields)/vector2DField/vector2DFieldIOField.C
 $(Fields)/sphericalTensorField/sphericalTensorField.C
@@ -685,7 +683,6 @@ $(Fields)/tensorField/tensorIOField.C
 $(Fields)/tensorField/tensorFieldIOField.C
 $(Fields)/quaternionField/quaternionField.C
 $(Fields)/quaternionField/quaternionIOField.C
-$(Fields)/triadField/triadField.C
 $(Fields)/triadField/triadIOField.C
 $(Fields)/complex/complexField.C
 $(Fields)/complex/complexVectorField.C
diff --git a/src/OpenFOAM/fields/Fields/triadField/triadField.C b/src/OpenFOAM/fields/Fields/triadField/triadField.C
deleted file mode 100644
index bb43bae40c..0000000000
--- a/src/OpenFOAM/fields/Fields/triadField/triadField.C
+++ /dev/null
@@ -1,48 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2012 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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "triadField.H"
-#include "transformField.H"
-
-#define TEMPLATE
-#include "FieldFunctionsM.C"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "undefFieldFunctionsM.H"
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/triadField/triadField.H b/src/OpenFOAM/fields/Fields/triadField/triadField.H
index 868d307372..a76d99137a 100644
--- a/src/OpenFOAM/fields/Fields/triadField/triadField.H
+++ b/src/OpenFOAM/fields/Fields/triadField/triadField.H
@@ -30,7 +30,7 @@ Description
     Specialisation of Field\<T\> for triad.
 
 SourceFiles
-    triadField.C
+    triadField.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,10 +40,8 @@ SourceFiles
 #include "triadFieldFwd.H"
 #include "Field.H"
 
-#define TEMPLATE
-#include "FieldFunctionsM.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "undefFieldFunctionsM.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H b/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H
index 3edc0fa7d2..c2bd94147e 100644
--- a/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H
+++ b/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H
@@ -23,14 +23,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::triadField
-
 Description
-    Forward declarations of the specialisation of Field\<T\> for triad.
-
-SourceFiles
-    triadField.C
+    Forward declarations of Field\<T\> triad specialisation.
 
 \*---------------------------------------------------------------------------*/
 
@@ -47,6 +41,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type> class Field;
+
 typedef Field<triad> triadField;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.C b/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.C
deleted file mode 100644
index e4d2792b7a..0000000000
--- a/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017 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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "vector2DField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::vector2DField> Foam::zip
-(
-    const tmp<scalarField>& x,
-    const tmp<scalarField>& y
-)
-{
-    auto txy = tmp<vector2DField>::New(x->size());
-    auto& xy = txy.ref();
-
-    xy.replace(0, x);
-    xy.replace(1, y);
-
-    return txy;
-}
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.H b/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.H
index a2950fe6bb..4a0850dd03 100644
--- a/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.H
+++ b/src/OpenFOAM/fields/Fields/vector2DField/vector2DField.H
@@ -27,7 +27,7 @@ Description
     Foam::vector2DField
 
 SourceFiles
-    vector2DField.C
+    vector2DField.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,16 +39,6 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-tmp<vector2DField> zip(const tmp<scalarField>& x, const tmp<scalarField>& y);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/vectorField/vectorField.C b/src/OpenFOAM/fields/Fields/vectorField/vectorField.C
deleted file mode 100644
index ff49308dc5..0000000000
--- a/src/OpenFOAM/fields/Fields/vectorField/vectorField.C
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017 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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "vectorField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::vectorField> Foam::zip
-(
-    const tmp<scalarField>& x,
-    const tmp<scalarField>& y,
-    const tmp<scalarField>& z
-)
-{
-    auto txyz = tmp<vectorField>::New(x->size());
-    auto& xyz = txyz.ref();
-
-    xyz.replace(0, x);
-    xyz.replace(1, y);
-    xyz.replace(2, z);
-
-    return txyz;
-}
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/vectorField/vectorField.H b/src/OpenFOAM/fields/Fields/vectorField/vectorField.H
index c18db77bb0..9af987cb95 100644
--- a/src/OpenFOAM/fields/Fields/vectorField/vectorField.H
+++ b/src/OpenFOAM/fields/Fields/vectorField/vectorField.H
@@ -51,13 +51,6 @@ typedef Field<vector> vectorField;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-tmp<vectorField> zip
-(
-    const tmp<scalarField>& x,
-    const tmp<scalarField>& y,
-    const tmp<scalarField>& z
-);
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam