Remove split & defer transition

We must now be using solvers.
remove all old style solvers (that might still be used, this is to try a test run)
Amend 5a0b918 : no need to group by uid