MAPREDUCE-5809: cleanup