diff --git a/.gitignore b/.gitignore
index ff6a74ed8f..bf6e6444d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .*~
 *.orig
 *.bak
+\#*\#
 
 # CVS recovered versions - anywhere
 .#*
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/#Merkle.C# b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/#Merkle.C#
deleted file mode 100644
index 52ce5fe382..0000000000
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/#Merkle.C#
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "Merkle.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace phaseChangeTwoPhaseMixtures
-{
-    defineTypeNameAndDebug(Merkle, 0);
-    addToRunTimeSelectionTable(phaseChangeTwoPhaseMixture, Merkle, components);
-}
-}
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const word& alpha1Name
-)
-:
-    phaseChangeTwoPhaseMixture(typeName, U, phi, alpha1Name),
-
-    UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
-    tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
-    Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")),
-    Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")),
-
-    p0_("0", pSat().dimensions(), 0.0),
-
-    mcCoeff_(Cc_/(0.5*sqr(UInf_)*tInf_)),
-    mvCoeff_(Cv_*rho1()/(0.5*sqr(UInf_)*tInf_*rho2()))
-{
-    correct();
-}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
-Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotAlphal() const
-{
-    const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
-
-    return Pair<tmp<volScalarField> >
-    (
-        mcCoeff_*max(p - pSat(), p0_),
diff --git a/applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/ParMetis-3.1/ParMETISLib/Make/#options# b/applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/ParMetis-3.1/ParMETISLib/Make/#options#
deleted file mode 100644
index 90632e801e..0000000000
--- a/applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/ParMetis-3.1/ParMETISLib/Make/#options#
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(RULES)/mplib$(WM_MPLIB)
-
-EXE_INC = $(PFLAGS) $(PINC)
-LIB_LIBS = $(PLIBS)
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/#options# b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/#options#
deleted file mode 100644
index ae2f653666..0000000000
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/#options#
+++ /dev/null
@@ -1,20 +0,0 @@
-EXE_INC = \
-    -I$(FOAM_SRC)/postProcessing/postCalc \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/LESmodels \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
-
-EXE_LIBS = \
-    $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume \
-    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModels \
-    -lincompressibleLESmodels \
-    -lbasicThermophysicalModels \
-    -lspecie \
-    -lcompressibleTurbulenceModels \
-    -lcompressibleLESmodels
-