cleanup splitMapJoin usage