Remove more custom ID stuff on Segments
Merge branch 'mbst-9986-scrubbables' into stage