Removed commented out method.
Moved on_*_segment methods to dataset_module.