Remove legancy code which we not need anymore as we use gathering writes anyway everywhere
Merge remote-tracking branch: upstream/master