Backport classes cleanup and speedup

Backport PR 4655 - cleanup of SimTrack, CoreSimTrack without change of data format.