fix: minor refactor: remove SourceInfo
#15563
+51
−64
Merged
SourceInfo
#15563