Remove more custom ID stuff on Segments