#139 #140 removed TODOs from shared batchwriter after creating issues