cleaning some segment definitions

chasing non-deterministic errors