Removing segmentation stuff (will put in separate review)