Only keeping the code relying on cpp core lib.
The previous code is still in unit tests (verifying the saving works).