reduce dependency from DDD
optimize size
remve useless pointer
remove for good
rollback
modernize
Merge pull request #4919 from VinInn/CleamTkGeom

Cleanup tracker geometry.