Moved control of integration into SplitSolver
Removed some unused variables