disorderedmaterials · trisyoungs · Jun 25, 2026 · Jun 25, 2026 · Jun 26, 2026
diff --git a/benchmark/common/problems.h b/benchmark/common/problems.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "classes/box.h"
-#include "classes/coreData.h"
 #include "expression/variable.h"
 #include "main/dissolve.h"
 #include "nodes/configuration.h"

diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt
@@ -15,7 +15,6 @@ add_library(
   configuration_sites.cpp
   configuration_upkeep.cpp
   configurationAtom.cpp
-  coreData.cpp
   empiricalFormula.cpp
   fullPairIterator.cpp
   histogramSet.cpp
@@ -72,7 +71,6 @@ add_library(
   cellArray.h
   configuration.h
   configurationAtom.cpp
-  coreData.h
   empiricalFormula.h
   fragment.h
   histogramSet.h

diff --git a/src/classes/configuration_upkeep.cpp b/src/classes/configuration_upkeep.cpp
@@ -3,6 +3,7 @@
 
 #include "classes/box.h"
 #include "classes/cell.h"
+#include "classes/configuration.h"
 #include "classes/configurationAtom.h"
 #include "main/dissolve.h"
 

diff --git a/src/classes/coreData.cpp b/src/classes/coreData.cpp
diff --git a/src/classes/coreData.h b/src/classes/coreData.h
diff --git a/src/classes/isotopologue.cpp b/src/classes/isotopologue.cpp
@@ -3,7 +3,6 @@
 
 #include "classes/isotopologue.h"
 #include "classes/atomType.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include "data/isotopes.h"
 

diff --git a/src/classes/isotopologueSet.cpp b/src/classes/isotopologueSet.cpp
@@ -3,7 +3,6 @@
 
 #include "classes/isotopologueSet.h"
 #include "base/lineParser.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include <algorithm>
 

diff --git a/src/classes/isotopologueSet.h b/src/classes/isotopologueSet.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "base/serialiser.h"
-#include "classes/coreData.h"
 
 // Forward Declarations
 class Species;

diff --git a/src/classes/speciesAngle.cpp b/src/classes/speciesAngle.cpp
@@ -2,10 +2,9 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "classes/speciesAngle.h"
-#include "classes/coreData.h"
+#include "classes/species.h"
 #include "classes/speciesAtom.h"
 #include "math/mathFunc.h"
-#include <map>
 
 SpeciesAngle::SpeciesAngle() : SpeciesIntra(nullptr, AngleFunctions::Form::None) {}
 

diff --git a/src/classes/speciesAtom.cpp b/src/classes/speciesAtom.cpp
@@ -4,7 +4,6 @@
 #include "classes/speciesAtom.h"
 #include "classes/atomType.h"
 #include "classes/box.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include "classes/speciesBond.h"
 #include <algorithm>

diff --git a/src/classes/speciesBond.cpp b/src/classes/speciesBond.cpp
@@ -2,11 +2,9 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "classes/speciesBond.h"
-#include "base/sysFunc.h"
-#include "classes/coreData.h"
+#include "classes/species.h"
 #include "classes/speciesAtom.h"
 #include "data/atomicMasses.h"
-#include <map>
 
 SpeciesBond::SpeciesBond() : SpeciesIntra(nullptr, BondFunctions::Form::None) {}
 

diff --git a/src/classes/speciesImproper.cpp b/src/classes/speciesImproper.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "classes/speciesImproper.h"
-#include "classes/coreData.h"
+#include "classes/species.h"
 #include "classes/speciesAtom.h"
 #include "classes/speciesTorsion.h"
 

diff --git a/src/classes/speciesSite.cpp b/src/classes/speciesSite.cpp
@@ -3,7 +3,6 @@
 
 #include "classes/speciesSite.h"
 #include "base/lineParser.h"
-#include "classes/coreData.h"
 #include "classes/site.h"
 #include "classes/species.h"
 #include "data/atomicMasses.h"

diff --git a/src/classes/speciesTorsion.cpp b/src/classes/speciesTorsion.cpp
@@ -2,10 +2,9 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "classes/speciesTorsion.h"
-#include "classes/coreData.h"
+#include "classes/species.h"
 #include "classes/speciesAtom.h"
 #include "math/mathFunc.h"
-#include <map>
 
 SpeciesTorsion::SpeciesTorsion() : SpeciesIntra(nullptr, TorsionFunctions::Form::None) {}
 

diff --git a/src/classes/species_intra.cpp b/src/classes/species_intra.cpp
@@ -4,7 +4,6 @@
 #include "base/sysFunc.h"
 #include "classes/atomType.h"
 #include "classes/box.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include "templates/algorithms.h"
 #include <algorithm>

diff --git a/src/classes/torsionFunctions.cpp b/src/classes/torsionFunctions.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (c) 2026 Team Dissolve and contributors
 
-#include "classes/coreData.h"
 #include "classes/speciesAtom.h"
 #include "classes/speciesTorsion.h"
 #include <map>

diff --git a/src/data/ff/camelloneBKS/camelloneBKS.cpp b/src/data/ff/camelloneBKS/camelloneBKS.cpp
@@ -4,7 +4,6 @@
 #include "data/ff/camelloneBKS/camelloneBKS.h"
 #include "base/sysFunc.h"
 #include "classes/atomType.h"
-#include "classes/coreData.h"
 #include "classes/speciesAtom.h"
 #include "data/ff/angleTerm.h"
 #include "data/ff/atomType.h"

diff --git a/src/data/ff/ff.cpp b/src/data/ff/ff.cpp
@@ -4,7 +4,6 @@
 #include "data/ff/ff.h"
 #include "classes/atomType.h"
 #include "classes/box.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include "classes/speciesAtom.h"
 #include "classes/speciesBond.h"

diff --git a/src/data/ff/uff/uff.cpp b/src/data/ff/uff/uff.cpp
@@ -3,7 +3,6 @@
 
 #include "data/ff/uff/uff.h"
 #include "classes/atomType.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include "data/elements.h"
 #include "math/mathFunc.h"

diff --git a/src/data/ff/uff/uff4MOF.cpp b/src/data/ff/uff/uff4MOF.cpp
@@ -3,7 +3,6 @@
 
 #include "data/ff/uff/uff4MOF.h"
 #include "classes/atomType.h"
-#include "classes/coreData.h"
 #include "classes/species.h"
 #include "data/elements.h"
 

diff --git a/src/dissolve-gui-qml.cpp b/src/dissolve-gui-qml.cpp
@@ -17,8 +17,7 @@
 int main(int args, char **argv)
 {
     // Instantiate main classes
-    CoreData coreData;
-    Dissolve dissolve(coreData);
+    Dissolve dissolve;
 
     DissolveModel dissolveModel;
     dissolveModel.setDissolve(dissolve);