Consolidate pre-processing into two stages: splitting and cleaning