diff --git a/cmake/GENIESetup.cmake b/cmake/GENIESetup.cmake
index 11c64b3..0dfd88e 100644
--- a/cmake/GENIESetup.cmake
+++ b/cmake/GENIESetup.cmake
@@ -1,168 +1,166 @@
 # Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE 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.
 #
 #    NUISANCE 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 NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 # TODO
 # check system for libxml2
 # check whether we need the includes
 # check if we can use a subset of the GENIE libraries
 
 ################################################################################
 #                            Check Dependencies
 ################################################################################
 
 #################################  GENIE  ######################################
 if(GENIE STREQUAL "")
   cmessage(FATAL_ERROR "Variable GENIE is not defined. "
     "The location of a pre-built GENIE install must be defined either as"
     " $ cmake -DGENIE=/path/to/GENIE or as and environment vairable"
     " $ export GENIE=/path/to/GENIE")
 endif()
 
 if (BUILD_GEVGEN)
   cmessage(STATUS "Building custom gevgen")
   LIST(APPEND EXTRA_CXX_FLAGS -D__GEVGEN_ENABLED__)
 endif()
 
 # Extract GENIE VERSION
 if (GENIE_VERSION STREQUAL "AUTO")
    execute_process (COMMAND ${CMAKE_SOURCE_DIR}/cmake/getgenieversion.sh ${GENIE}
    OUTPUT_VARIABLE GENIE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
 execute_process (COMMAND genie-config
   --libs OUTPUT_VARIABLE GENIE_LD_FLAGS_STR OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND genie-config
   --topsrcdir OUTPUT_VARIABLE GENIE_INCLUDES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 string(REGEX MATCH "-L\([^ ]+\) \(.*\)$" PARSE_GENIE_LIBS_MATCH ${GENIE_LD_FLAGS_STR})
 
 cmessage(DEBUG "genie-config --libs: ${GENIE_LD_FLAGS_STR}")
 
 if(NOT PARSE_GENIE_LIBS_MATCH)
   cmessage(FATAL_ERROR "Expected to be able to parse the result of genie-config --libs to a lib directory and a list of libraries to include, but got: \"${GENIE_LD_FLAGS_STR}\"")
 endif()
 
 set(GENIE_LIB_DIR ${CMAKE_MATCH_1})
 set(GENIE_LIBS_RAW ${CMAKE_MATCH_2})
 string(REPLACE "-l" "" GENIE_LIBS_STRIPED "${GENIE_LIBS_RAW}")
 
 cmessage(STATUS "GENIE version : ${GENIE_VERSION}")
 cmessage(STATUS "GENIE libdir  : ${GENIE_LIB_DIR}")
 cmessage(STATUS "GENIE libs    : ${GENIE_LIBS_STRIPED}")
 
 string(REGEX MATCH "ReinSeghal" WASMATCHED ${GENIE_LIBS_STRIPED})
 if(WASMATCHED AND GENIE_VERSION STREQUAL "210")
   set(GENIE_SEHGAL ${GENIE_LIBS_STRIPED})
   STRING(REPLACE "ReinSeghal" "ReinSehgal" GENIE_LIBS_STRIPED ${GENIE_SEHGAL})
   cmessage(DEBUG "Fixed inconsistency in library naming: ${GENIE_LIBS_STRIPED}")
 endif()
 
 string(REGEX MATCH "ReWeight" WASMATCHED ${GENIE_LIBS_STRIPED})
 if(NOT WASMATCHED)
   set(GENIE_LIBS_STRIPED "GReWeight ${GENIE_LIBS_STRIPED}")
   cmessage(DEBUG "Force added ReWeight library: ${GENIE_LIBS_STRIPED}")
 endif()
 
 string(REPLACE " " ";" GENIE_LIBS_LIST "-Wl,--start-group ${GENIE_LIBS_STRIPED} -Wl,--end-group")
 cmessage(DEBUG "genie-config --libs -- MATCH1: ${CMAKE_MATCH_1}")
 cmessage(DEBUG "genie-config --libs -- MATCH2: ${CMAKE_MATCH_2}")
 cmessage(DEBUG "genie-config --libs -- libs stripped: ${GENIE_LIBS_STRIPED}")
 cmessage(DEBUG "genie-config --libs -- libs list: ${GENIE_LIBS_LIST}")
 
 ################################  LHAPDF  ######################################
 if(LHAPDF_LIB STREQUAL "")
   cmessage(FATAL_ERROR "Variable LHAPDF_LIB is not defined. The location of a pre-built lhapdf install must be defined either as $ cmake -DLHAPDF_LIB=/path/to/LHAPDF_libraries or as and environment vairable $ export LHAPDF_LIB=/path/to/LHAPDF_libraries")
 endif()
 
 if(LHAPDF_INC STREQUAL "")
   cmessage(FATAL_ERROR "Variable LHAPDF_INC is not defined. The location of a pre-built lhapdf install must be defined either as $ cmake -DLHAPDF_INC=/path/to/LHAPDF_includes or as and environment vairable $ export LHAPDF_INC=/path/to/LHAPDF_includes")
 endif()
 
 if(LHAPATH STREQUAL "")
   cmessage(FATAL_ERROR "Variable LHAPATH is not defined. The location of a the LHAPATH directory must be defined either as $ cmake -DLHAPATH=/path/to/LHAPATH or as and environment variable $ export LHAPATH=/path/to/LHAPATH")
 endif()
 
 ################################  LIBXML  ######################################
 if(LIBXML2_LIB STREQUAL "")
   cmessage(FATAL_ERROR "Variable LIBXML2_LIB is not defined. The location of a pre-built libxml2 install must be defined either as $ cmake -DLIBXML2_LIB=/path/to/LIBXML2_libraries or as and environment vairable $ export LIBXML2_LIB=/path/to/LIBXML2_libraries")
 endif()
 
 if(LIBXML2_INC STREQUAL "")
   cmessage(FATAL_ERROR "Variable LIBXML2_INC is not defined. The location of a pre-built libxml2 install must be defined either as $ cmake -DLIBXML2_INC=/path/to/LIBXML2_includes or as and environment vairable $ export LIBXML2_INC=/path/to/LIBXML2_includes")
 endif()
 ###############################  log4cpp  ######################################
 if(LOG4CPP_LIB STREQUAL "")
   find_program(LOG4CPPCFG log4cpp-config)
   if(NOT LOG4CPPCFG STREQUAL "LOG4CPPCFG-NOTFOUND")
     execute_process (COMMAND ${LOG4CPPCFG}
     --pkglibdir OUTPUT_VARIABLE LOG4CPP_LIB OUTPUT_STRIP_TRAILING_WHITESPACE)
   else()
     message(FATAL_ERROR "Variable LOG4CPP_LIB is not defined. The location of a pre-built log4cpp install must be defined either as $ cmake -DLOG4CPP_LIB=/path/to/LOG4CPP_libraries or as and environment vairable $ export LOG4CPP_LIB=/path/to/LOG4CPP_libraries")
   endif()
 endif()
 
 if(LOG4CPP_INC  STREQUAL "")
   find_program(LOG4CPPCFG log4cpp-config)
   if(NOT LOG4CPPCFG STREQUAL "LOG4CPPCFG-NOTFOUND")
     execute_process (COMMAND ${LOG4CPPCFG}
     --pkgincludedir OUTPUT_VARIABLE LOG4CPP_INC OUTPUT_STRIP_TRAILING_WHITESPACE)
   else()
     message(FATAL_ERROR "Variable LOG4CPP_INC is not defined. The location of a pre-built log4cpp install must be defined either as $ cmake -DGENIE_LOG4CPP_INC=/path/to/LOG4CPP_includes or as and environment vairable $ export LOG4CPP_INC=/path/to/LOG4CPP_includes")
   endif()
 endif()
 ################################################################################
 
 LIST(APPEND EXTRA_CXX_FLAGS -D__GENIE_ENABLED__ -D__GENIE_VERSION__=${GENIE_VERSION})
 
 LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES
   ${GENIE_INCLUDES_DIR}
   ${GENIE_INCLUDES_DIR}/GHEP
   ${GENIE_INCLUDES_DIR}/Ntuple
   ${GENIE_INCLUDES_DIR}/ReWeight
   ${GENIE_INCLUDES_DIR}/Apps
   ${GENIE_INCLUDES_DIR}/FluxDrivers
   ${GENIE_INCLUDES_DIR}/EVGDrivers
   ${LHAPDF_INC}
   ${LIBXML2_INC}
   ${LOG4CPP_INC})
 
 SAYVARS()
 
 LIST(APPEND EXTRA_LINK_DIRS
   ${GENIE_LIB_DIR}
   ${LHAPDF_LIB}
   ${LIBXML2_LIB}
   ${LOG4CPP_LIB})
 
-LIST(APPEND EXTRA_LIBS -Wl,--start-group)
 LIST(APPEND EXTRA_LIBS ${GENIE_LIBS_LIST})
-LIST(APPEND EXTRA_LIBS -Wl,--end-group)
 
 LIST(APPEND EXTRA_LIBS LHAPDF xml2 log4cpp)
 
 if(USE_PYTHIA8)
   set(NEED_PYTHIA8 TRUE)
   set(NEED_ROOTPYTHIA8 TRUE)
 else()
   set(NEED_PYTHIA6 TRUE)
   set(NEED_ROOTPYTHIA6 TRUE)
 endif()
 set(NEED_ROOTEVEGEN TRUE)
 
 SET(USE_GENIE TRUE CACHE BOOL "Whether to enable GENIE (reweight) support. Requires external libraries. <FALSE>" FORCE)
diff --git a/cmake/NEUTSetup.cmake b/cmake/NEUTSetup.cmake
index 3b2b3b8..26a624a 100644
--- a/cmake/NEUTSetup.cmake
+++ b/cmake/NEUTSetup.cmake
@@ -1,141 +1,140 @@
 # Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE 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.
 #
 #    NUISANCE 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 NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 if(NEUT_ROOT STREQUAL "")
   cmessage(FATAL_ERROR "Variable NEUT_ROOT is not defined. Please export environment variable NEUT_ROOT or configure with -DNEUT_ROOT=/path/to/NEUT. This must be set to point to a prebuilt NEUT instance.")
 endif()
 
 if(CERN STREQUAL "")
   cmessage(FATAL_ERROR "Variable CERN is not defined. Please export environment variable CERN or configure with -DCERN=/path/to/CERNLIB. This must be set to point to a prebuilt CERNLIB instance.")
 endif()
 
 if(CERN_LEVEL STREQUAL "")
     cmessage(FATAL_ERROR "Variable CERN_LEVEL is not defined. Please export environment variable CERN_LEVEL or configure with -DCERN_LEVEL=XXXX (likely to be 2005).")
 endif()
 
 if(${NEUT_VERSION} VERSION_LESS 5.4.0)
   set(NEUT_LIB_DIR ${NEUT_ROOT}/lib/Linux_pc)
 else()
   set(NEUT_LIB_DIR ${NEUT_ROOT}/lib)
 endif()
 
 set(NEUT_CLASS ${NEUT_ROOT}/src/neutclass)
 
 LIST(APPEND EXTRA_CXX_FLAGS -D__NEUT_ENABLED__ -DNEUT_VERSION=${NEUT_VERSION})
 
 LIST(APPEND EXTRA_CXX_FLAGS
   -I${NEUT_ROOT}/include
   -I${NEUT_ROOT}/src/neutclass
   -I${NEUT_ROOT}/src/reweight)
 
 LIST(APPEND EXTRA_LINK_DIRS
   ${NEUT_LIB_DIR}
   ${CERN}/${CERN_LEVEL}/lib
   ${NEUT_ROOT}/src/reweight)
 
 if(${NEUT_VERSION} VERSION_EQUAL 5.4.2)
   LIST(APPEND EXTRA_LIBS
     NReWeight
     -Wl,--start-group
     neutcore_5.4.2
     nuccorspl_5.4.2 #typo in NEUT, may hopefully disappear
     nuceff_5.4.2
     partnuck_5.4.2
     skmcsvc_5.4.2
     tauola_5.4.2
     HT2p2h_5.4.0
     N1p1h_5.4.0
     -Wl,--end-group
     jetset74
     pdflib804
     mathlib
     packlib
     pawlib)
 
   LIST(APPEND EXTRA_CXX_FLAGS -DNEUT_COMMON_QEAV)
 elseif(${NEUT_VERSION} VERSION_EQUAL 5.4.0)
   LIST(APPEND EXTRA_LIBS
     NReWeight
     -Wl,--start-group
     neutcore_5.4.0
     nuccorspl_5.4.0 #typo in NEUT, may hopefully disappear
     nuceff_5.4.0
     partnuck_5.4.0
     skmcsvc_5.4.0
     tauola_5.4.0
     HT2p2h_5.4.0
     N1p1h_5.4.0
     -Wl,--end-group
     jetset74
     pdflib804
     mathlib
     packlib
     pawlib)
 else()
   LIST(APPEND EXTRA_LIBS
     NReWeight
     -Wl,--start-group
     neutcore
     nuccorrspl
     nuceff
     partnuck
     skmcsvc
     tauola
     -Wl,--end-group
     jetset74
     pdflib804
     mathlib
     packlib
     pawlib)
 endif()
 
 set(NEUT_ROOT_LIBS)
 
 LIST(APPEND NEUT_ROOT_LIBS
   -Wl,--no-as-needed
   ${NEUT_CLASS}/neutctrl.so
   ${NEUT_CLASS}/neutfsivert.so)
 
 # Check for new versions of NEUT with NUCLEON FSI
 if(EXISTS "${NEUT_CLASS}/neutnucfsistep.so")
   set(NEUT_NUCFSI 1)
   LIST(APPEND EXTRA_CXX_FLAGS -DNEUT_NUCFSI_ENABLED)
 
   LIST(APPEND NEUT_ROOT_LIBS
     ${NEUT_CLASS}/neutnucfsistep.so
     ${NEUT_CLASS}/neutnucfsivert.so
     )
 endif()
 
 if(${NEUT_VERSION} VERSION_LESS 5.4.0)
   LIST(APPEND NEUT_ROOT_LIBS
     ${NEUT_CLASS}/neutrootTreeSingleton.so)
 endif()
 
 LIST(APPEND NEUT_ROOT_LIBS
   ${NEUT_CLASS}/neutvtx.so
   ${NEUT_CLASS}/neutfsipart.so
   ${NEUT_CLASS}/neutpart.so
   ${NEUT_CLASS}/neutvect.so
-  -Wl,--as-needed
   )
 
 foreach(OBJ ${NEUT_ROOT_LIBS})
   LIST(APPEND EXTRA_SHAREDOBJS ${OBJ})
 endforeach()