cleanup
convert to in mapper combiner + some cleanup