cleaning main branch to use segmented ones