Make use of new SMatrix features

did not manage to remove the root file as they do not appear in my area