Clean up splitting