diff --git a/src/ClazyContext.cpp b/src/ClazyContext.cpp
index e29d4ad..33d7dcc 100644
--- a/src/ClazyContext.cpp
+++ b/src/ClazyContext.cpp
@@ -1,131 +1,106 @@
 /*
     This file is part of the clazy static checker.
 
     Copyright (C) 2017 Sergio Martins <smartins@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "AccessSpecifierManager.h"
 #include "ClazyContext.h"
 #include "FixItExporter.h"
 #include "PreProcessorVisitor.h"
 
 #include <clang/AST/ParentMap.h>
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Lex/PreprocessorOptions.h>
 #include <clang/Rewrite/Frontend/FixItRewriter.h>
 #include <llvm/Support/Regex.h>
 
 #include <stdlib.h>
 
 using namespace std;
 using namespace clang;
 
-class ClazyFixItOptions
-    : public FixItOptions
-{
-public:
-    ClazyFixItOptions(const ClazyFixItOptions &other) = delete;
-    ClazyFixItOptions()
-    {
-        if (const char *suffix = getenv("CLAZY_FIXIT_SUFFIX"))
-            m_suffix = suffix;
-
-        InPlace = m_suffix.empty();
-        FixWhatYouCan = true;
-        FixOnlyWarnings = true;
-        Silent = false;
-    }
-
-    std::string RewriteFilename(const std::string &filename, int &fd) override
-    {
-        fd = -1;
-        return InPlace ? filename
-                       : filename + m_suffix;
-    }
-
-    std::string m_suffix;
-};
 
 ClazyContext::ClazyContext(const clang::CompilerInstance &compiler,
                            const string &headerFilter, const string &ignoreDirs,
                            string exportFixesFilename, ClazyOptions opts)
     : ci(compiler)
     , astContext(ci.getASTContext())
     , sm(ci.getSourceManager())
     , m_noWerror(getenv("CLAZY_NO_WERROR") != nullptr) // Allows user to make clazy ignore -Werror
     , options(opts)
     , extraOptions(clazy::splitString(getenv("CLAZY_EXTRA_OPTIONS"), ','))
 {
     if (!headerFilter.empty())
         headerFilterRegex = std::unique_ptr<llvm::Regex>(new llvm::Regex(headerFilter));
 
     if (!ignoreDirs.empty())
         ignoreDirsRegex = std::unique_ptr<llvm::Regex>(new llvm::Regex(ignoreDirs));
 
     if (exportFixesEnabled()) {
         if (exportFixesFilename.empty()) {
             // Only clazy-standalone sets the filename by argument.
             // clazy plugin sets it automatically here:
             const FileEntry *fileEntry = sm.getFileEntryForID(sm.getMainFileID());
             exportFixesFilename = fileEntry->getName().str() + ".clazy.yaml";
         }
 
         exporter = new FixItExporter(ci.getDiagnostics(), sm, ci.getLangOpts(), exportFixesFilename);
     }
 }
 
 ClazyContext::~ClazyContext()
 {
     //delete preprocessorVisitor; // we don't own it
     delete accessSpecifierManager;
     delete parentMap;
 
     if (exporter) {
         exporter->Export();
         delete exporter;
     }
 
     preprocessorVisitor = nullptr;
     accessSpecifierManager = nullptr;
     parentMap = nullptr;
 }
 
 void ClazyContext::enableAccessSpecifierManager()
 {
     if (!accessSpecifierManager && !usingPreCompiledHeaders())
         accessSpecifierManager = new AccessSpecifierManager(ci);
 }
 
 void ClazyContext::enablePreprocessorVisitor()
 {
     if (!preprocessorVisitor && !usingPreCompiledHeaders())
         preprocessorVisitor = new PreProcessorVisitor(ci);
 }
 
 bool ClazyContext::isQt() const
 {
     static const bool s_isQt = [this] {
                                    for (auto s : ci.getPreprocessorOpts().Macros) {
                                        if (s.first == "QT_CORE_LIB")
                                            return true;
                                    }
                                    return false;
                                } ();
 
     return s_isQt;
 }