Cleaning up segment definitions.
Cleaning up makers.