Finish subsplits clean

Do I forgot something @stof ?