Revert "Merge branch 'TrkSurface_move_icc_cxx' into 'master'"

This reverts merge request !59137 (merged)

As it seems (not 100% sure as is 1 test out of 4 , so might be CPU load) to cause a cpu regression in SiSp Track Finder.

In anycase this was prb the least importand of these cleanups