diff --git a/v2.5/generators/nlojet++/README b/v2.5/generators/nlojet++/README
index bb80bec0876d6dfcfa41e8fe770c76ceeb9524d7..e67891fef9beef469d0c5e2e5f88c3dbcb29725f 100644
--- a/v2.5/generators/nlojet++/README
+++ b/v2.5/generators/nlojet++/README
@@ -16,7 +16,7 @@
 # For installation of interface package: Patched version of NLOJet++-4.1.3:      nlojet++-4.1.3-patched.tar.gz
 #                                        FastJet-3.0.6 for the example scenario: fastjet-3.0.6.tar.gz
 #                                        The fastNLO Toolkit 2.3.0pre:           fastnlo_toolkit-2.3.1pre-1854.tar.gz
-# The fastNLO toolkit requires:          LHAPDF version 5 or 6, e.g.:            lhapdf-5.9.1.tar.gz
+# The fastNLO toolkit requires:          LHAPDF version 6
 #
 # All these packages are also downloadable from http://fastnlo.hepforge.org/code/v23/code-v23.html
 
diff --git a/v2.5/toolkit/README b/v2.5/toolkit/README
index 607317cd226fb53bc8ee17c86347f0f08173e039..ba811370395c7af9680a3ee3dfa37edaff60d349 100644
--- a/v2.5/toolkit/README
+++ b/v2.5/toolkit/README
@@ -28,7 +28,7 @@ cd fastnlo_toolkit-v.v.v-nnnn
 ./configure --prefix=/path/to/your/local/installation_directory
 
 #    If the same installation directory or other system-wide known installation directories
-#    contain already a version of LHAPDF version 5 or 6, LHAPDF will be found and used
+#    contain already a version of LHAPDF version 6, LHAPDF will be found and used
 #    automatically.
 #    If not, please specify the path to where LHAPDF is installed, i.e. where
 #    'bin/lhapdf-config' can be found:
@@ -95,7 +95,7 @@ fnlo-tk-example -h
 # or
 fnlo-tk-cppread -h
 # for some usage explanations.
-# In case of LHAPDF6, the PDF sets have to be specified without extension.
+# For LHAPDF6, the PDF sets have to be specified without extension.
 
 
 # For developers ONLY:
diff --git a/v2.5/toolkit/TODO b/v2.5/toolkit/TODO
index faea2dec6fa9482a7eb75c8cedf894a1e5e23acd..98fe785d9d4577518223ac9baeb33bdef721a733 100644
--- a/v2.5/toolkit/TODO
+++ b/v2.5/toolkit/TODO
@@ -9,7 +9,6 @@ TODO list for fastNLO_toolkit (ordered by priority)
 - Add checks for HOPPET, CRunDec, QCDNUM
 - Change everything to use LHAPDF6 features instead of deprecated LHAGLUE;
   partially done in HOPPET interface
-- Drop LHAPDF5 support
 - Use binary read/write table to save storage space and read in times (Mark's suggestion)
   (Not clear that binary storage actually saves anything ...! Test first.)
 - Provide features to allow -> APPLgrid conversion and the inverse -> fastNLO
@@ -35,6 +34,7 @@ TODO list for fastNLO_toolkit (ordered by priority)
 =======================================================================
 DONE
 =======================================================================
+ - Drop LHAPDF5 support
  - Include stat. uncertainties into table
  - Modifier & Concatenator for tables/bins
  - fast Warmup-run (just some events and then 'guess' PS boundaries)
diff --git a/v2.5/toolkit/configure.ac b/v2.5/toolkit/configure.ac
index 4cddcd760678a566108d1f95ff887c3e46323935..9102dca19591f2c6d8437ab58823199903d1802e 100644
--- a/v2.5/toolkit/configure.ac
+++ b/v2.5/toolkit/configure.ac
@@ -483,7 +483,7 @@ AM_CONDITIONAL(HAVE_ROOT, test "x$ROOTPREFIX" != "x")
 # Create code documentation with Doxygen
 AC_MSG_NOTICE([******************************************])
 AC_MSG_NOTICE([Checking whether doxygen code documentation is requested ...])
-AC_MSG_NOTICE([Use en/disable_doxygen_doc to switch on/off.])
+AC_MSG_NOTICE([Use --enable-doxygen-doc to switch on.])
 AC_MSG_NOTICE([******************************************])
 if test "x$enable_doxygen_chi" != "x"; then
    AC_MSG_WARN([Option en/disable_doxygen_chi is not implemented and simply IGNORED!])
@@ -512,7 +512,7 @@ fi
 if test "x$enable_doxygen_dot" != "x"; then
    AC_MSG_WARN([Option en/disable_doxygen_dot is not implemented. Dot will be used if available.])
 fi
-if test "x$enable_doxygen_doc" != "xno"; then
+if test "x$enable_doxygen_doc" != "x" && test "x$enable_doxygen_doc" != "xno"; then
 # Check on DOXYGEN
    AC_MSG_NOTICE([Doxygen code documentation desired.])
    AC_CHECK_PROGS(DOXYGEN, doxygen, doxygen)
diff --git a/v2.5/toolkit/doc/paper/fnlo-paper.tex b/v2.5/toolkit/doc/paper/fnlo-paper.tex
index 215cf9da012f43b1a2da88fca91b12309c0364b1..dd7274f25bed319cd8ba8f25f91602e626fecea2 100644
--- a/v2.5/toolkit/doc/paper/fnlo-paper.tex
+++ b/v2.5/toolkit/doc/paper/fnlo-paper.tex
@@ -200,7 +200,7 @@ How to use fastNLOReader:
 \paragraph{Inheritance structure of fastNLOReader}
 \paragraph{fastNLOReader}
 \subsubsection{Predefined fastNLOReader interfaces}
-\paragraph{LHAPDF5 and LHAPDF6}
+\paragraph{LHAPDF6}
 \paragraph{QCDNUM}
 \paragraph{Hoppet}
 \subsection{Implementing a new PDF interface}
diff --git a/v2.5/toolkit/fastnlotoolkit/fastNLOCRunDec.cc b/v2.5/toolkit/fastnlotoolkit/fastNLOCRunDec.cc
index 2be97d3e850e85f7a41a88aef00cbb4b0119b7b1..4173b338be9493bce4df12d9832c8ebc84358dde 100644
--- a/v2.5/toolkit/fastnlotoolkit/fastNLOCRunDec.cc
+++ b/v2.5/toolkit/fastnlotoolkit/fastNLOCRunDec.cc
@@ -123,7 +123,6 @@ void fastNLOCRunDec::SetPDGValues() {
 }
 
 void fastNLOCRunDec::SetLHAPDFValues(std::string LHAPDFFile, int PDFMem) {
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    // AlphaS_MZ can vary among PDF members, so we really need the PDF member info from LHAPDF
    const LHAPDF::PDFInfo PDFMemInfo(LHAPDFFile, PDFMem);
    QMass[0] = PDFMemInfo.get_entry_as<double>("MDown");
@@ -162,19 +161,6 @@ void fastNLOCRunDec::SetLHAPDFValues(std::string LHAPDFFile, int PDFMem) {
       exit(11);
    }
    fAlphasMz = PDFMemInfo.get_entry_as<double>("AlphaS_MZ");
-#else
-   // TODO: Remove old LHAPDF5 stuff
-   cerr << "LHAPDF5 not supported anymore! Please update." << endl;
-   exit(1);
-   // fAlphasMz = LHAPDF::alphasPDF(fiPDFMember,fMz);
-   // fnLoop = LHAPDF::getOrderAlphaS(fiPDFMember) + 1;
-   // for (int i = 0; i < 6; i++)
-   //    QMass[i] = LHAPDF::getQMass(fiPDFMember,i+1);
-   // fAlphasMz = LHAPDF::alphasPDF(fMz);
-   // fnLoop = LHAPDF::getOrderAlphaS() + 1;
-   // for (int i = 0; i < 6; i++)
-   //    QMass[i] = LHAPDF::getQMass(i+1);
-#endif
 }
 
 
diff --git a/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc b/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc
index 0c871d40b7cec30762e4aaf59e65a645ba741f85..126b6294697533eff49ba82e9727f174b830aa6d 100644
--- a/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc
+++ b/v2.5/toolkit/fastnlotoolkit/fastNLOLHAPDF.cc
@@ -33,10 +33,8 @@ using namespace std;
 fastNLOLHAPDF::fastNLOLHAPDF(string name) : fastNLOReader(name), fnPDFs(0) , fiPDFMember(0) , fchksum(0.) {
    logger.info["fastNLOLHAPDF"]<<"Please initialize a PDF file using SetLHAPDFFilename( PDFFile ) and a PDF set using SetLHAPDFMember(int PDFMember)"<<std::endl;
 
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    PDFSet = NULL;
    PDF = NULL;
-   #endif
 }
 
 //______________________________________________________________________________
@@ -45,29 +43,24 @@ fastNLOLHAPDF::fastNLOLHAPDF(string name) : fastNLOReader(name), fnPDFs(0) , fiP
 fastNLOLHAPDF::fastNLOLHAPDF(const fastNLOTable& table) : fastNLOReader(table), fnPDFs(0) , fiPDFMember(0) , fchksum(0.) {
    logger.info["fastNLOLHAPDF"]<<"Please initialize a PDF file using SetLHAPDFFilename( PDFFile ) and a PDF set using SetLHAPDFMember(int PDFMember)"<<std::endl;
 
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    PDFSet = NULL;
    PDF = NULL;
-   #endif
 }
 //______________________________________________________________________________
 
 
 fastNLOLHAPDF::~fastNLOLHAPDF() {
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
+
    delete PDFSet;
    delete PDF;
-   #endif
 }
 
 //______________________________________________________________________________
 
 
 fastNLOLHAPDF::fastNLOLHAPDF(string name, string LHAPDFFile, int PDFMember) : fastNLOReader(name), fnPDFs(0) , fiPDFMember(0) , fchksum(0.) {
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    PDFSet = NULL;
    PDF = NULL;
-   #endif
    SetLHAPDFFilename(LHAPDFFile);
    SetLHAPDFMember(PDFMember);
    // Call additional initialization. Not necessary for LHAPDF.
@@ -78,10 +71,8 @@ fastNLOLHAPDF::fastNLOLHAPDF(string name, string LHAPDFFile, int PDFMember) : fa
 
 
 fastNLOLHAPDF::fastNLOLHAPDF(const fastNLOTable& table, string LHAPDFFile, int PDFMember) : fastNLOReader(table), fnPDFs(0) , fiPDFMember(0) , fchksum(0.) {
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    PDFSet = NULL;
    PDF = NULL;
-   #endif
    SetLHAPDFFilename(LHAPDFFile);
    SetLHAPDFMember(PDFMember);
    // Call additional initialization. Not necessary for LHAPDF.
@@ -110,10 +101,7 @@ int fastNLOLHAPDF::GetNFlavor() const {
 }
 
 double fastNLOLHAPDF::GetAlphasMz() const {
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    return PDF->alphasQ(91.1876);
-   #endif
-   return LHAPDF::alphasPDF(91.1876);
 }
 
 int fastNLOLHAPDF::GetIPDFMember() const {
@@ -140,11 +128,8 @@ double fastNLOLHAPDF::EvolveAlphas(double Q) const {
    // WARNING: You cannot change alpha_s(Mz), but is is
    // defined with the pdf. 'alphasMz' is not used here!
    //
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    return PDF->alphasQ(Q);
-   #else
-   return LHAPDF::alphasPDF(Q);
-   #endif
+
 }
 
 
@@ -166,31 +151,9 @@ bool fastNLOLHAPDF::InitPDF() {
       return false;
    }
 
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    // Suppress LHAPDF6 output at each member change
    LHAPDF::setVerbosity(0);
    return true;
-
-   #else
-   //LHAPDF::setVerbosity(LHAPDF::SILENT);
-   LHAPDF::setVerbosity(LHAPDF::LOWKEY);
-   // Do not use the ByName feature, destroys ease of use on the grid without LHAPDF
-   //LHAPDF::initPDFSetByName(fLHAPDFFilename);
-   //cout << "PDF set name " << fLHAPDFFilename << endl;
-   if (fchksum == 0 || fchksum != CalcChecksum(1.)) {
-      // need to reset LHAPDF.
-      logger.debug["InitPDF"]<<"Need to reset lhapdf. fchksum="<<fchksum<<"\tCalcChecksum(1.)="<<CalcChecksum(1.)<<endl;
-      LHAPDF::initPDFSet(fLHAPDFFilename);
-      fnPDFs = LHAPDF::numberPDF()+1; // LHAPDF counts 0-44 and returns, 44 which must be 45
-      if (fnPDFs < fiPDFMember+1) {
-         logger.error["InitPDF"]<<"There are only "<<fnPDFs<<" pdf sets within this LHAPDF file. You were looking for set number "<<fiPDFMember<<std::endl;
-         return false;
-      }
-      LHAPDF::initPDF(fiPDFMember);
-   }
-   fchksum = CalcChecksum(1.);
-   return true;
-   #endif
 }
 
 
@@ -203,15 +166,11 @@ vector<double> fastNLOLHAPDF::GetXFX(double xp, double muf) const {
    //  GetXFX is used to get the parton array from the
    //  pre-defined pdf-interface.
    //
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    // vector<double> xfx(13);
    // PDF->xfxQ(xp, muf, xfx);
    vector <double> xfx(13);
    PDF->xfxQ(xp,muf,xfx);
    return xfx;
-   #else
-   return LHAPDF::xfx(xp,muf);
-   #endif
 }
 
 
@@ -221,18 +180,10 @@ vector<double> fastNLOLHAPDF::GetXFX(double xp, double muf) const {
 void fastNLOLHAPDF::SetLHAPDFFilename(string filename) {
    if (filename != fLHAPDFFilename) fchksum = 0;
    fLHAPDFFilename = filename;
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    if ( PDFSet ) delete PDFSet;
    PDFSet = new LHAPDF::PDFSet(filename);
    fnPDFs = PDFSet->size();
    SetLHAPDFMember(0);
-   #else
-   // Reset pdfset member to zero
-   fiPDFMember = 0;
-   // KR: Reactivated this. Why was it switched off?
-   // --> Mass settings etc. can be read from LHAPDF after setting the filename, i.e. the set.
-   InitPDF();
-   #endif
 }
 
 
@@ -240,22 +191,9 @@ void fastNLOLHAPDF::SetLHAPDFFilename(string filename) {
 
 
 void fastNLOLHAPDF::SetLHAPDFMember(int set) {
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    if ( PDF ) delete PDF;
    PDF = PDFSet->mkPDF(set);
    fiPDFMember=set;
-   #else
-   fiPDFMember = set;
-   if (fchksum == CalcChecksum(1.)) {  // nothin has changed? we set only the pdfmember
-      logger.debug["SetLHAPDFMember"]<<"Changing only pdfmember!"<<endl;
-      LHAPDF::initPDF(fiPDFMember);
-      fchksum = CalcChecksum(1.);
-   } else  {
-      logger.debug["SetLHAPDFMember"]<<"Demanding full re-initalization of PDF."<<endl;
-      fchksum = 0;
-   }
-   //InitPDF();
-   #endif
 }
 
 
@@ -273,18 +211,7 @@ void fastNLOLHAPDF::PrintPDFInformation() const {
    // second instance with another pdf. Then also the first one is using this
    // pdf when evaluating CalcCrossSection (after a PDFCacheRefilling).
    //
-
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    cout << PDFSet->description();
-   #else
-   printf(" ##################################################################################\n");
-   printf(" #  fastNLOLHAPDF::PrintCurrentLHAPDFInformation.\n");
-   printf(" #      Your currently initalized pdf is called:\n");
-   LHAPDF::getDescription();
-   printf(" #      Information about current PDFMember in current LHAPDF-file cannot be displayed.\n");
-   printf(" #      Please use fastNLOReader::SetLHAPDFMember(int) to choose a pdf-set.\n");
-   printf(" ##################################################################################\n");
-   #endif
 }
 
 void fastNLOLHAPDF::SetMz(double Mz) {
@@ -313,7 +240,6 @@ void fastNLOLHAPDF::InitEvolveAlphas() {
 
 
 
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
 //______________________________________________________________________________
 vector<LHAPDF::PDFUncertainty>  fastNLOLHAPDF::GetPDFUncertaintyLHAPDF(double cl, bool alternative) {
    //! Calculate PDF uncertainty on cross sections.
@@ -417,7 +343,6 @@ vector<double>  fastNLOLHAPDF::CalcPDFUncertaintySymm(const vector<LHAPDF::PDFUn
       ret[iObs] = PDFUnc[iObs].errsymm;
    return ret;
 }
-#endif
 
 
 //______________________________________________________________________________
@@ -454,14 +379,12 @@ XsUncertainty fastNLOLHAPDF::GetPDFUncertainty(const fastNLO::EPDFUncertaintySty
       logger.error["GetPDFUncertainty"]<<"ERROR! HERAPDF1.0 uncertainty style not yet implemented, exiting."<<endl;
       logger.error["GetPDFUncertainty"]<<"ePDFUnc = "<<ePDFUnc<<endl;
       exit(1);
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    } else if ( ePDFUnc == fastNLO::kLHAPDF6 ) {
       if ( lNorm ) {
          logger.error["GetPDFUncertainty"]<<"Normalization option does not work with LHAPDF6 PDF uncertainties, aborted!"<<endl;
       } else {
          logger.info["GetPDFUncertainty"]<<"Calculating LHAPDF6 PDF uncertainties."<<endl;
       }
-#endif
    } else {
       logger.error["GetPDFUncertainty"]<<"ERROR! Selected PDF uncertainty style not yet implemented, exiting."<<endl;
       logger.error["GetPDFUncertainty"]<<"ePDFUnc = "<<ePDFUnc<<endl;
@@ -597,14 +520,12 @@ XsUncertainty fastNLOLHAPDF::GetPDFUncertainty(const fastNLO::EPDFUncertaintySty
          logger.debug["GetPDFUncertainty"]<<"iobs = " << iobs << ", dxsl = " << XsUnc.dxsl[iobs] << ", dxsu = " << XsUnc.dxsu[iobs] <<endl;
       }
    } else {
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
       // Default is no alternative for NNPDF replica uncertainties
       vector<LHAPDF::PDFUncertainty> L6PDFUnc = GetPDFUncertaintyLHAPDF(100*erf(1/sqrt(2)),false);
       //      vector<LHAPDF::PDFUncertainty> L6PDFUnc = GetPDFUncertaintyLHAPDF();
       XsUnc.xs   = CalcPDFUncertaintyCentral(L6PDFUnc);
       XsUnc.dxsu = CalcPDFUncertaintyRelPlus(L6PDFUnc);
       XsUnc.dxsl = CalcPDFUncertaintyRelMinus(L6PDFUnc);
-#endif
    }
 
    logger.info["GetPDFUncertainty"]<<"Setting PDF member back to default of zero."<<endl;
diff --git a/v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOLHAPDF.h b/v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOLHAPDF.h
index 3b4ecaeec97736ac2779e0fa26cc448b7fd30711..cba4a9a3db932cbe60ad975b60e8281efb6375f3 100644
--- a/v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOLHAPDF.h
+++ b/v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOLHAPDF.h
@@ -57,7 +57,7 @@ public:
    int GetNFlavor() const;
    LHAPDF::PDFSet* GetPDFSet() const { return PDFSet;};
    LHAPDF::PDF* GetPDF() const { return PDF;};
-   
+
    double GetAlphasMz() const;
 
    //! Return struct with vectors containing the cross section values and the selected a_s(M_Z) uncertainty
@@ -73,7 +73,6 @@ public:
 
    // Deprecated: Replaced by struct as return object: Return vector of pairs with all cross section values first and pairs of PDF uncertainties second
    //   vector < pair < double, pair <double, double> > > GetPDFUncertainty(const EPDFUncertaintyStyle ePDFUnc);
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    std::vector<LHAPDF::PDFUncertainty>  GetPDFUncertaintyLHAPDF(double cl=100*erf(1/sqrt(2)), bool alternative=false); //!< return PDF uncertainty, formulae taken from LHAPDF6
    std::vector<double> CalcPDFUncertaintyMinus(const std::vector<LHAPDF::PDFUncertainty>& ) const; //!<get vector<double> for PDF-minus uncertainty. Uncertainties are POSITIVE!
    std::vector<double> CalcPDFUncertaintyPlus(const std::vector<LHAPDF::PDFUncertainty>& ) const; //!<get vector<double> for PDF-up uncertainty
@@ -81,7 +80,6 @@ public:
    std::vector<double> CalcPDFUncertaintyRelPlus(const std::vector<LHAPDF::PDFUncertainty>& ) const; //!<get vector<double> for relative PDF-up uncertainty
    std::vector<double> CalcPDFUncertaintySymm(const std::vector<LHAPDF::PDFUncertainty>& ) const; //!< get vector<double> for symmetrized PDF uncertainty
    std::vector<double> CalcPDFUncertaintyCentral(const std::vector<LHAPDF::PDFUncertainty>& ) const; //!< get vector<double> for 'new' central value
-#endif
 
    // inherited functions
    virtual double EvolveAlphas(double Q) const ;
@@ -92,10 +90,8 @@ protected:
 
    // ---- LHAPDF vars ---- //
    std::string fLHAPDFFilename;
-   #if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    LHAPDF::PDFSet* PDFSet;
    LHAPDF::PDF* PDF;
-   #endif
    int fnPDFs;
    int fiPDFMember;
 
diff --git a/v2.5/toolkit/m4/ax_prog_doxygen.m4 b/v2.5/toolkit/m4/ax_prog_doxygen.m4
index ed1dc83b4fb52d73726d228c070eaece91f6c4fc..9a34322cee78c1dbe33186ac2c242413eb2f6677 100644
--- a/v2.5/toolkit/m4/ax_prog_doxygen.m4
+++ b/v2.5/toolkit/m4/ax_prog_doxygen.m4
@@ -104,16 +104,16 @@
 ## ----------##
 
 DX_ENV=""
-AC_DEFUN([DX_FEATURE_doc],  ON)
+AC_DEFUN([DX_FEATURE_doc],  OFF)
 AC_DEFUN([DX_FEATURE_dot],  OFF)
 AC_DEFUN([DX_FEATURE_man],  OFF)
-AC_DEFUN([DX_FEATURE_html], ON)
+AC_DEFUN([DX_FEATURE_html], OFF)
 AC_DEFUN([DX_FEATURE_chm],  OFF)
 AC_DEFUN([DX_FEATURE_chi],  OFF)
 AC_DEFUN([DX_FEATURE_rtf],  OFF)
 AC_DEFUN([DX_FEATURE_xml],  OFF)
-AC_DEFUN([DX_FEATURE_pdf],  ON)
-AC_DEFUN([DX_FEATURE_ps],   ON)
+AC_DEFUN([DX_FEATURE_pdf],  OFF)
+AC_DEFUN([DX_FEATURE_ps],   OFF)
 
 ## --------------- ##
 ## Private macros. ##
diff --git a/v2.5/toolkit/src/fnlo-tk-config.in b/v2.5/toolkit/src/fnlo-tk-config.in
index e85266c3307848e83b11ed1671b1b0026ec46ce5..6bd30540b3caa28dcb116ad62696d6848bb30614 100644
--- a/v2.5/toolkit/src/fnlo-tk-config.in
+++ b/v2.5/toolkit/src/fnlo-tk-config.in
@@ -47,7 +47,7 @@ tmp=$( echo "$*" | egrep -- '--\<ldflags\>')
 test -n "$tmp" && OUT="$OUT -L@libdir@ -lfastnlotoolkit"
 
 tmp=$( echo "$*" | egrep -- '--\<pythondir\>')
-test -n "$tmp" && OUT="$OUT @prefix@@pythondir@"
+test -n "$tmp" && test -n "@pythondir@" && OUT="$OUT @prefix@@pythondir@"
 
 ## Version& revision number
 tmp=$( echo "$*" | egrep -- '--\<version\>')
diff --git a/v2.5/toolkit/src/fnlo-tk-cppread.cc b/v2.5/toolkit/src/fnlo-tk-cppread.cc
index 6483b1d2aa855065c7a122f448c9c4aabc5da0ac..1207e263e91bec9757feb969eb572252f0a560ff 100644
--- a/v2.5/toolkit/src/fnlo-tk-cppread.cc
+++ b/v2.5/toolkit/src/fnlo-tk-cppread.cc
@@ -108,7 +108,6 @@ int main(int argc, char** argv) {
          man << "       Specification: <> mandatory; [] optional." << endl;
          man << "<fastNLOtable.tab>: Table input file, e.g. fnl2342b.tab" << endl;
          man << "[PDF]: PDF set, def. = CT10nlo" << endl;
-         man << "   For LHAPDF5: Specify set names WITH filename extension, e.g. \".LHgrid\"." << endl;
          man << "   For LHAPDF6: Specify set names WITHOUT filename extension." << endl;
          man << "   If the PDF set still is not found, then:" << endl;
          man << "   - Check, whether the LHAPDF environment variable is set correctly." << endl;
@@ -166,11 +165,7 @@ int main(int argc, char** argv) {
       PDFFile = (const char*) argv[2];
    }
    if (argc <= 2 || PDFFile == "_") {
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
       PDFFile = "CT10nlo";
-#else
-      PDFFile = "CT10nlo.LHgrid";
-#endif
       shout["fnlo-tk-cppread"] << "No PDF set given, taking " << PDFFile << " instead!" << endl;
    } else {
       shout["fnlo-tk-cppread"] << "Using PDF set   : " << PDFFile << endl;
@@ -928,7 +923,6 @@ int main(int argc, char** argv) {
    //! cout << "Read from LHAPDF: Number of loops = " << nloop << endl;
    if ( AsEvolCode != "LHAPDF" ) fnlo->SetNLoop(NLoop);//! Default = 2, else from command line; does not work with LHAPDF.
 
-   //! Unfortunately, LHAPDF5 neither has a function to access alphas(M_Z) directly!
    //! double asmz = fnlo->GetAlphasMz(Mz);
    //! cout << "Read from LHAPDF: alpha_s at M_Z = " << asmz << endl;
    if ( AsEvolCode != "LHAPDF" ) {
@@ -942,7 +936,6 @@ int main(int argc, char** argv) {
       //!   fnlo->SetAlphasMz(0.1190);//! NNPDF21-NLO
    }
 
-   //! Nor does LHAPDF5 has a function to access M_Z!
    if ( AsEvolCode != "LHAPDF" ) {
       fnlo->SetMz(Mz);//! Default = 91.1876 (PDG), else from command line; does not work with LHAPDF.
       //!   double Mz = 91.174;  //! ABM11
diff --git a/v2.5/toolkit/src/fnlo-tk-example.cc b/v2.5/toolkit/src/fnlo-tk-example.cc
index ffa9144462aa506d42f5339740a0192968cd2fe2..073416df3fddd0cc29fb072bfe8ca5e7ac9b4a73 100644
--- a/v2.5/toolkit/src/fnlo-tk-example.cc
+++ b/v2.5/toolkit/src/fnlo-tk-example.cc
@@ -61,11 +61,7 @@ int main(int argc, char** argv) {
    shout["fnlo-tk-example"] << "fastNLO Example Evaluator" << endl;
    yell << _SSEPSC << endl;
    string tablename;
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    string PDFFile = "CT10nlo";
-#else
-   string PDFFile = "CT10nlo.LHgrid";
-#endif
    if (argc <= 1) {
       error["fnlo-tk-example"] << "No fastNLO table specified!" << endl;
       shout["fnlo-tk-example"] << "For an explanation of command line arguments type:" << endl;
@@ -85,7 +81,6 @@ int main(int argc, char** argv) {
          man << "       Arguments: <> mandatory; [] optional." << endl;
          man << "<fastNLOtable.tab>: Table input file fnl2342b.tab" << endl;
          man << "[PDF]: PDF set, def. = CT10nlo" << endl;
-         man << "   For LHAPDF5: Specify set names WITH filename extension, e.g. \".LHgrid\"." << endl;
          man << "   For LHAPDF6: Specify set names WITHOUT filename extension." << endl;
          man << "   If the PDF set still is not found, then:" << endl;
          man << "   - Check, whether the LHAPDF environment variable is set correctly." << endl;
@@ -172,7 +167,6 @@ int main(int argc, char** argv) {
 
    //! --- Example calculation of cross section including PDF uncertainty using LHAPDF6 specifically
    //!
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    vector<LHAPDF::PDFUncertainty> PDFUnc = fnlo.GetPDFUncertaintyLHAPDF();
    //! Using the following call the CL can be changed and the alternativ asymmetric NNPDF uncertainty
    //! around the median as implemented in LHAPDF6 can be switched on.
@@ -194,7 +188,6 @@ int main(int argc, char** argv) {
 
    //! Finish?
    return 0;
-#endif
 
 
    //! --- Example filling of ROOT histogram with previously calculated cross section and uncertainty
diff --git a/v2.5/toolkit/src/fnlo-tk-rootout.cc b/v2.5/toolkit/src/fnlo-tk-rootout.cc
index 06e70cfc269af06fa6fa43f12297f1375c21a3bb..75f6d3abf263cb639c3e7aed4ffa637004e10ece 100644
--- a/v2.5/toolkit/src/fnlo-tk-rootout.cc
+++ b/v2.5/toolkit/src/fnlo-tk-rootout.cc
@@ -92,7 +92,6 @@ int main(int argc, char** argv) {
          man << "       Arguments: <> mandatory; [] optional." << endl;
          man << "<fastNLOtable.tab>: Table input file, e.g. fnl2342b.tab" << endl;
          man << "[PDF]: PDF set, def. = series of CT14nlo, MMHT2014nlo68cl, NNPDF30_nlo_as_0118, PDF4LHC15_nlo_mc" << endl;
-         man << "   For LHAPDF5: Specify set names WITH filename extension, e.g. \".LHgrid\"." << endl;
          man << "   For LHAPDF6: Specify set names WITHOUT filename extension." << endl;
          man << "   If the PDF set still is not found, then:" << endl;
          man << "   - Check, whether the LHAPDF environment variable is set correctly." << endl;
@@ -105,9 +104,7 @@ int main(int argc, char** argv) {
          man << "                 HP (pairwise asymmetric Hessian PDF uncertainty --> CTEQ|MSTW PDFs)" << endl;
          man << "                 HC (pairwise asymmetric Hessian PDF uncertainty rescaled to CL68 --> CTEQ PDFs)" << endl;
          man << "                 MC (MC sampling PDF uncertainty --> NNPDF PDFs)" << endl;
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
          man << "                 L6 (LHAPDF6 PDF uncertainty --> LHAPDF6 PDFs)" << endl;
-#endif
          man << "[order]: Fixed-order precision to use, def. = series up to highest fixed-order available" << endl;
          man << "   Alternatives: LO, NLO, NNLO (if available)" << endl;
          man << "[norm]: Normalize if applicable, def. = no." << endl;
@@ -171,11 +168,9 @@ int main(int argc, char** argv) {
       } else if ( chunc == "MC" ) {
          ePDFUnc = kMCSampling;
          shout["fnlo-tk-rootout"] << "Showing MC sampling PDF uncertainty (--> NNPDF PDFs)." << endl;
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
       } else if ( chunc == "L6" ) {
          ePDFUnc = kLHAPDF6;
          shout["fnlo-tk-rootout"] << "Showing LHAPDF6 PDF uncertainty (--> LHAPDF6 PDFs)." << endl;
-#endif
       } else {
          error["fnlo-tk-rootout"] << "Illegal choice of uncertainty, " << chunc << ", aborted!" << endl;
          exit(1);
@@ -255,11 +250,7 @@ int main(int argc, char** argv) {
 
    //! --- Prepare loop over PDF sets
    const int nsets = 4;
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
    string StandardPDFSets[nsets] = {"CT14nlo", "MMHT2014nlo68cl", "NNPDF30_nlo_as_0118", "PDF4LHC15_nlo_mc"};
-#else
-   string StandardPDFSets[nsets] = {"CT10nlo.LHgrid", "MSTW2008nlo68cl.LHgrid", "NNPDF21_100.LHgrid", "NNPDF10_100.lHpdf"};
-#endif
    EPDFUncertaintyStyle ePDFUncs[nsets] = {kHessianCTEQCL68, kHessianAsymmetricMax, kMCSampling, kMCSampling};
 
    vector < string > PDFFiles;
diff --git a/v2.5/toolkit/src/fnlo-tk-statunc.cc b/v2.5/toolkit/src/fnlo-tk-statunc.cc
index d4a7d26448cb28d7e39207ee24b12daecc7c46c5..751fb5a71904271df0a2e44cac0d6dbac54eccda 100644
--- a/v2.5/toolkit/src/fnlo-tk-statunc.cc
+++ b/v2.5/toolkit/src/fnlo-tk-statunc.cc
@@ -101,7 +101,6 @@ int main(int argc, char** argv) {
          man << "<fastNLOsample>: Basename of table input files, e.g. fnl2452_I1082936_v23_flex-hhc-born-2jet_," << endl;
          man << "                 that will be complemented by 'nnnn.tab'" << endl;
          man << "[PDF]: PDF set, def. = CT10nlo" << endl;
-         man << "   For LHAPDF5: Specify set names WITH filename extension, e.g. \".LHgrid\"." << endl;
          man << "   For LHAPDF6: Specify set names WITHOUT filename extension." << endl;
          man << "   If the PDF set still is not found, then:" << endl;
          man << "   - Check, whether the LHAPDF environment variable is set correctly." << endl;
@@ -128,11 +127,7 @@ int main(int argc, char** argv) {
       PDFFile = (const char*) argv[2];
    }
    if (argc <= 2 || PDFFile == "_") {
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
       PDFFile = "CT10nlo";
-#else
-      PDFFile = "CT10nlo.LHgrid";
-#endif
       shout["fnlo-tk-statunc"] << "No PDF set given, taking " << PDFFile << " instead!" << endl;
    } else {
       shout["fnlo-tk-statunc"] << "Using PDF set   : " << PDFFile << endl;
diff --git a/v2.5/toolkit/src/fnlo-tk-yodaout.cc b/v2.5/toolkit/src/fnlo-tk-yodaout.cc
index bb8c8a121066c7b7cc011b2ca68c134e820ebf60..5ad715bf03b07cd1a8979456e965c80a13013791 100644
--- a/v2.5/toolkit/src/fnlo-tk-yodaout.cc
+++ b/v2.5/toolkit/src/fnlo-tk-yodaout.cc
@@ -92,7 +92,6 @@ int main(int argc, char** argv) {
          man << "       Arguments: <> mandatory; [] optional." << endl;
          man << "<fastNLOtable.tab>: Table input file, e.g. fnl2342b.tab" << endl;
          man << "[PDF]: PDF set, def. = CT10nlo" << endl;
-         man << "   For LHAPDF5: Specify set names WITH filename extension, e.g. \".LHgrid\"." << endl;
          man << "   For LHAPDF6: Specify set names WITHOUT filename extension." << endl;
          man << "   If the PDF set still is not found, then:" << endl;
          man << "   - Check, whether the LHAPDF environment variable is set correctly." << endl;
@@ -107,9 +106,7 @@ int main(int argc, char** argv) {
          man << "                 HP (pairwise asymmetric Hessian PDF uncertainty --> CTEQ|MSTW PDFs)" << endl;
          man << "                 HC (pairwise asymmetric Hessian PDF uncertainty rescaled to CL68 --> CTEQ PDFs)" << endl;
          man << "                 MC (MC sampling PDF uncertainty --> NNPDF PDFs)" << endl;
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
          man << "                 L6 (LHAPDF6 PDF uncertainty --> LHAPDF6 PDFs)" << endl;
-#endif
          man << "                 AS (a_s(M_Z) variation uncertainty with GRV evolution)" << endl;
          man << "                 ST (statistical uncertainty of x section calculation, if available)" << endl;
          man << "[order]: Fixed-order precision to use, def. = NLO" << endl;
@@ -145,11 +142,7 @@ int main(int argc, char** argv) {
       PDFFile = (const char*) argv[2];
    }
    if (argc <= 2 || PDFFile == "_") {
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
       PDFFile = "CT10nlo";
-#else
-      PDFFile = "CT10nlo.LHgrid";
-#endif
       shout["fnlo-tk-yodaout"] << "No PDF set given, taking " << PDFFile << " instead!" << endl;
    } else {
       shout["fnlo-tk-yodaout"] << "Using PDF set   : " << PDFFile << endl;
@@ -191,11 +184,9 @@ int main(int argc, char** argv) {
       } else if ( chunc == "MC" ) {
          ePDFUnc = kMCSampling;
          shout["fnlo-tk-yodaout"] << "Showing MC sampling PDF uncertainty (--> NNPDF PDFs)." << endl;
-#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
       } else if ( chunc == "L6" ) {
          ePDFUnc = kLHAPDF6;
          shout["fnlo-tk-yodaout"] << "Showing LHAPDF6 PDF uncertainty (--> LHAPDF6 PDFs)." << endl;
-#endif
       } else if ( chunc == "AS" ) {
          eAsUnc = kAsGRV;
          shout["fnlo-tk-yodaout"] << "Showing a_s(M_Z) uncertainty with GRV evolution." << endl;