diff --git a/Source/Wrapper/AnalysisModule_wrp.F90 b/Source/Wrapper/AnalysisModule_wrp.F90
index 6ae08f26..9f12f24e 100644
--- a/Source/Wrapper/AnalysisModule_wrp.F90
+++ b/Source/Wrapper/AnalysisModule_wrp.F90
@@ -1,7 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the linear solvers module for calling from other languages.
 MODULE AnalysisModule_wrp
-  USE AnalysisModule, ONLY : PivotedCholeskyDecomposition, ReduceDimension
+  USE AnalysisModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/ChebyshevSolversModule_wrp.F90 b/Source/Wrapper/ChebyshevSolversModule_wrp.F90
index ede2569a..1283c70c 100644
--- a/Source/Wrapper/ChebyshevSolversModule_wrp.F90
+++ b/Source/Wrapper/ChebyshevSolversModule_wrp.F90
@@ -1,9 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the Chebyshev Solvers Module
 MODULE ChebyshevSolversModule_wrp
-  USE ChebyshevSolversModule, ONLY : ChebyshevPolynomial_t, &
-       & ConstructPolynomial, DestructPolynomial, SetCoefficient, Compute, &
-       & FactorizedCompute
+  USE ChebyshevSolversModule
   USE DataTypesModule, ONLY : NTREAL
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
diff --git a/Source/Wrapper/DensityMatrixSolversModule_wrp.F90 b/Source/Wrapper/DensityMatrixSolversModule_wrp.F90
index 284d9ac7..54e4cdd5 100644
--- a/Source/Wrapper/DensityMatrixSolversModule_wrp.F90
+++ b/Source/Wrapper/DensityMatrixSolversModule_wrp.F90
@@ -2,8 +2,7 @@
 !> Wraps the density matrix solvers module for calling from other languages.
 MODULE DensityMatrixSolversModule_wrp
   USE DataTypesModule, ONLY : NTREAL
-  USE DensityMatrixSolversModule, ONLY : TRS2, TRS4, HPCP, PM, ScaleAndFold, &
-       & EnergyDensityMatrix, DenseDensity
+  USE DensityMatrixSolversModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/EigenBoundsModule_wrp.F90 b/Source/Wrapper/EigenBoundsModule_wrp.F90
index e9e44fb5..12362210 100644
--- a/Source/Wrapper/EigenBoundsModule_wrp.F90
+++ b/Source/Wrapper/EigenBoundsModule_wrp.F90
@@ -2,7 +2,7 @@
 !> Wraps the eigenbounds module for calling from other languages.
 MODULE EigenBoundsModule_wrp
   USE DataTypesModule, ONLY : NTREAL
-  USE EigenBoundsModule, ONLY : GershgorinBounds, PowerBounds
+  USE EigenBoundsModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/EigenSolversModule_wrp.F90 b/Source/Wrapper/EigenSolversModule_wrp.F90
index 35fbb2a3..6a6ddb8c 100644
--- a/Source/Wrapper/EigenSolversModule_wrp.F90
+++ b/Source/Wrapper/EigenSolversModule_wrp.F90
@@ -1,7 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the eigensolvers module for calling from other languages.
 MODULE EigenSolversModule_wrp
-  USE EigenSolversModule, ONLY : EigenDecomposition
+  USE EigenSolversModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE PSMAtrixModule, ONLY : PrintMatrix
   USE SingularValueSolversModule, ONLY : SingularValueDecomposition
diff --git a/Source/Wrapper/ExponentialSolversModule_wrp.F90 b/Source/Wrapper/ExponentialSolversModule_wrp.F90
index ccfc01bf..7ff0efda 100644
--- a/Source/Wrapper/ExponentialSolversModule_wrp.F90
+++ b/Source/Wrapper/ExponentialSolversModule_wrp.F90
@@ -1,9 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the exponential solvers module for calling from other languages.
 MODULE ExponentialSolversModule_wrp
-  USE ExponentialSolversModule, ONLY : ComputeExponential, &
-       & ComputeExponentialPade, ComputeDenseExponential, &
-       & ComputeLogarithm, ComputeDenseLogarithm
+  USE ExponentialSolversModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/FermiOperatorModule_wrp.F90 b/Source/Wrapper/FermiOperatorModule_wrp.F90
index e2186dfd..1e8cf2dc 100644
--- a/Source/Wrapper/FermiOperatorModule_wrp.F90
+++ b/Source/Wrapper/FermiOperatorModule_wrp.F90
@@ -2,7 +2,7 @@
 !> Wraps the density matrix solvers module for calling from other languages.
 MODULE FermiOperatorModule_wrp
   USE DataTypesModule, ONLY : NTREAL
-  USE FermiOperatorModule, ONLY : ComputeDenseFOE
+  USE FermiOperatorModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/GeometryOptimizationModule_wrp.F90 b/Source/Wrapper/GeometryOptimizationModule_wrp.F90
index 3d27fb0b..5aa8164a 100644
--- a/Source/Wrapper/GeometryOptimizationModule_wrp.F90
+++ b/Source/Wrapper/GeometryOptimizationModule_wrp.F90
@@ -2,8 +2,7 @@
 !> Wraps the geometry optimization module for calling from other languages.
 MODULE GeometryOptimizationModule_wrp
   USE DataTypesModule, ONLY : NTREAL
-  USE GeometryOptimizationModule, ONLY : PurificationExtrapolate, &
-       & LowdinExtrapolate
+  USE GeometryOptimizationModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/HermiteSolversModule_wrp.F90 b/Source/Wrapper/HermiteSolversModule_wrp.F90
index 84e18dc1..6226920a 100644
--- a/Source/Wrapper/HermiteSolversModule_wrp.F90
+++ b/Source/Wrapper/HermiteSolversModule_wrp.F90
@@ -1,8 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the Hermite Solvers Module
 MODULE HermiteSolversModule_wrp
-  USE HermiteSolversModule, ONLY : HermitePolynomial_t, ConstructPolynomial, &
-       & DestructPolynomial, SetCoefficient, Compute
+  USE HermiteSolversModule
   USE DataTypesModule, ONLY : NTREAL
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
diff --git a/Source/Wrapper/InverseSolversModule_wrp.F90 b/Source/Wrapper/InverseSolversModule_wrp.F90
index f3f9bbbc..f877e9eb 100644
--- a/Source/Wrapper/InverseSolversModule_wrp.F90
+++ b/Source/Wrapper/InverseSolversModule_wrp.F90
@@ -1,7 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the matrix inversion module for calling from other languages.
 MODULE InverseSolversModule_wrp
-  USE InverseSolversModule, ONLY : Invert, DenseInvert, PseudoInverse
+  USE InverseSolversModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/LinearSolversModule_wrp.F90 b/Source/Wrapper/LinearSolversModule_wrp.F90
index 093465ab..8be4572b 100644
--- a/Source/Wrapper/LinearSolversModule_wrp.F90
+++ b/Source/Wrapper/LinearSolversModule_wrp.F90
@@ -1,7 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the linear solvers module for calling from other languages.
 MODULE LinearSolversModule_wrp
-  USE LinearSolversModule, ONLY : CGSolver, CholeskyDecomposition
+  USE LinearSolversModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/LoadBalancerModule_wrp.F90 b/Source/Wrapper/LoadBalancerModule_wrp.F90
index 5f3fa02c..42c36ee3 100644
--- a/Source/Wrapper/LoadBalancerModule_wrp.F90
+++ b/Source/Wrapper/LoadBalancerModule_wrp.F90
@@ -1,7 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the load balancer module for calling from other languages.
 MODULE LoadBalancerModule_wrp
-  USE LoadBalancerModule, ONLY : PermuteMatrix, UndoPermuteMatrix
+  USE LoadBalancerModule
   USE PermutationModule_wrp, ONLY : Permutation_wrp
   USE PMatrixMemoryPoolModule_wrp, ONLY : MatrixMemoryPool_p_wrp
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
diff --git a/Source/Wrapper/MatrixMemoryPoolModule_wrp.F90 b/Source/Wrapper/MatrixMemoryPoolModule_wrp.F90
index 39546aef..ede2bffe 100644
--- a/Source/Wrapper/MatrixMemoryPoolModule_wrp.F90
+++ b/Source/Wrapper/MatrixMemoryPoolModule_wrp.F90
@@ -1,9 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> A module for wrapping the matrix memory pool data type.
 MODULE MatrixMemoryPoolModule_wrp
-  USE MatrixMemoryPoolModule, ONLY : MatrixMemoryPool_lr, &
-       & MatrixMemoryPool_lc, DestructMatrixMemoryPool, &
-       & ConstructMatrixMemoryPool
+  USE MatrixMemoryPoolModule
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_int
   IMPLICIT NONE
diff --git a/Source/Wrapper/PMatrixMemoryPoolModule_wrp.F90 b/Source/Wrapper/PMatrixMemoryPoolModule_wrp.F90
index d2116e91..0c8d9b5f 100644
--- a/Source/Wrapper/PMatrixMemoryPoolModule_wrp.F90
+++ b/Source/Wrapper/PMatrixMemoryPoolModule_wrp.F90
@@ -2,8 +2,7 @@
 !> A module for wrapping the distributed sparse matrix memory pool.
 MODULE PMatrixMemoryPoolModule_wrp
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
-  USE PMatrixMemoryPoolModule, ONLY : MatrixMemoryPool_p, &
-       & DestructMatrixMemoryPool, ConstructMatrixMemoryPool
+  USE PMatrixMemoryPoolModule
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_int
   IMPLICIT NONE
diff --git a/Source/Wrapper/PermutationModule_wrp.F90 b/Source/Wrapper/PermutationModule_wrp.F90
index cfbf1a12..bedbd900 100644
--- a/Source/Wrapper/PermutationModule_wrp.F90
+++ b/Source/Wrapper/PermutationModule_wrp.F90
@@ -1,9 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !> Wraps the permutation module for calling from other languages.
 MODULE PermutationModule_wrp
-  USE PermutationModule, ONLY : Permutation_t, ConstructDefaultPermutation, &
-       & ConstructReversePermutation, ConstructRandomPermutation, &
-       & DestructPermutation
+  USE PermutationModule
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_int
   IMPLICIT NONE
diff --git a/Source/Wrapper/PolynomialSolversModule_wrp.F90 b/Source/Wrapper/PolynomialSolversModule_wrp.F90
index 65926334..ba0b869c 100644
--- a/Source/Wrapper/PolynomialSolversModule_wrp.F90
+++ b/Source/Wrapper/PolynomialSolversModule_wrp.F90
@@ -2,8 +2,7 @@
 !> Wraps the polynomial solvers module for calling from other languages.
 MODULE PolynomialSolversModule_wrp
   USE DataTypesModule, ONLY : NTREAL
-  USE PolynomialSolversModule, ONLY : Polynomial_t, ConstructPolynomial, &
-       & DestructPolynomial, SetCoefficient, Compute, FactorizedCompute
+  USE PolynomialSolversModule
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
diff --git a/Source/Wrapper/RootSolversModule_wrp.F90 b/Source/Wrapper/RootSolversModule_wrp.F90
index 2289ff49..d958f8c7 100644
--- a/Source/Wrapper/RootSolversModule_wrp.F90
+++ b/Source/Wrapper/RootSolversModule_wrp.F90
@@ -2,7 +2,7 @@
 !> Wraps the root solvers module for calling from other languages.
 MODULE RootSolversModule_wrp
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
-  USE RootSolversModule, ONLY : ComputeRoot, ComputeInverseRoot
+  USE RootSolversModule
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_int
diff --git a/Source/Wrapper/SMatrixAlgebraModule_wrp.F90 b/Source/Wrapper/SMatrixAlgebraModule_wrp.F90
index 2e21fc53..0292018a 100644
--- a/Source/Wrapper/SMatrixAlgebraModule_wrp.F90
+++ b/Source/Wrapper/SMatrixAlgebraModule_wrp.F90
@@ -4,8 +4,7 @@ MODULE SMatrixAlgebraModule_wrp
   USE DataTypesModule, ONLY : NTREAL, NTCOMPLEX
   USE MatrixMemoryPoolModule_wrp, ONLY : MatrixMemoryPool_lr_wrp, &
        & MatrixMemoryPool_lc_wrp
-  USE SMatrixAlgebraModule, ONLY : ScaleMatrix, IncrementMatrix, &
-       & MatrixMultiply, DotMatrix, PairwiseMultiplyMatrix
+  USE SMatrixAlgebraModule
   USE SMatrixModule, ONLY : Matrix_lsr, Matrix_lsc
   USE SMatrixModule_wrp, ONLY: Matrix_lsr_wrp, Matrix_lsc_wrp
   USE TripletListModule_wrp, ONLY : TripletList_r_wrp, TripletList_c_wrp
diff --git a/Source/Wrapper/SignSolversModule_wrp.F90 b/Source/Wrapper/SignSolversModule_wrp.F90
index b1ac3d78..13bc3759 100644
--- a/Source/Wrapper/SignSolversModule_wrp.F90
+++ b/Source/Wrapper/SignSolversModule_wrp.F90
@@ -2,8 +2,7 @@
 !> Wraps the sign solvers module for calling from other languages.
 MODULE SignSolversModule_wrp
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
-  USE SignSolversModule, ONLY : SignFunction, DenseSignFunction, &
-       & PolarDecomposition
+  USE SignSolversModule
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_int
diff --git a/Source/Wrapper/SolverParametersModule_wrp.F90 b/Source/Wrapper/SolverParametersModule_wrp.F90
index 9a7d9120..80ba7d4a 100644
--- a/Source/Wrapper/SolverParametersModule_wrp.F90
+++ b/Source/Wrapper/SolverParametersModule_wrp.F90
@@ -2,10 +2,7 @@
 !> A wrapper for the iterative solver parameters.
 MODULE SolverParametersModule_wrp
   USE DataTypesModule, ONLY : NTREAL
-  USE SolverParametersModule, ONLY : SolverParameters_t, &
-       & SetParametersConvergeDiff, SetParametersMaxIterations, &
-       & SetParametersThreshold, SetParametersBeVerbose, &
-       & SetParametersLoadBalance, DestructSolverParameters
+  USE SolverParametersModule
   USE PermutationModule_wrp, ONLY : Permutation_wrp
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_bool, c_int
diff --git a/Source/Wrapper/SquareRootSolversModule_wrp.F90 b/Source/Wrapper/SquareRootSolversModule_wrp.F90
index d600073e..016c4923 100644
--- a/Source/Wrapper/SquareRootSolversModule_wrp.F90
+++ b/Source/Wrapper/SquareRootSolversModule_wrp.F90
@@ -3,8 +3,7 @@
 MODULE SquareRootSolversModule_wrp
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
-  USE SquareRootSolversModule, ONLY : SquareRoot, InverseSquareRoot, &
-       & DenseSquareRoot, DenseInverseSquareRoot
+  USE SquareRootSolversModule
   USE WrapperModule, ONLY : SIZE_wrp
   USE ISO_C_BINDING, ONLY : c_int, c_bool
   IMPLICIT NONE
diff --git a/Source/Wrapper/TrigonometrySolversModule_wrp.F90 b/Source/Wrapper/TrigonometrySolversModule_wrp.F90
index c1023285..80600e53 100644
--- a/Source/Wrapper/TrigonometrySolversModule_wrp.F90
+++ b/Source/Wrapper/TrigonometrySolversModule_wrp.F90
@@ -3,7 +3,7 @@
 MODULE TrigonometrySolversModule_wrp
   USE PSMatrixModule_wrp, ONLY : Matrix_ps_wrp
   USE SolverParametersModule_wrp, ONLY : SolverParameters_wrp
-  USE TrigonometrySolversModule, ONLY : Sine, Cosine, DenseSine, DenseCosine
+  USE TrigonometrySolversModule
   USE WrapperModule, ONLY : SIZE_wrp
   USE iso_c_binding, ONLY : c_int, c_bool
   IMPLICIT NONE
diff --git a/Source/Wrapper/TripletListModule_wrp.F90 b/Source/Wrapper/TripletListModule_wrp.F90
index 61bf93e9..03f88cdf 100644
--- a/Source/Wrapper/TripletListModule_wrp.F90
+++ b/Source/Wrapper/TripletListModule_wrp.F90
@@ -2,10 +2,7 @@
 !> A module for wrapping the triplet list data type.
 MODULE TripletListModule_wrp
   USE DataTypesModule, ONLY : NTREAL, NTCOMPLEX
-  USE TripletListModule, ONLY : TripletList_r, TripletList_c, &
-       & AppendToTripletList, ResizeTripletList, &
-       & DestructTripletList, SetTripletAt, GetTripletAt, SortTripletList, &
-       & GetTripletListSize, ConstructTripletList
+  USE TripletListModule
   USE TripletModule, ONLY : Triplet_r, Triplet_c
   USE WrapperModule, ONLY : SIZE_wrp
   USE iso_c_binding, ONLY : c_int