Stopped duplicating data when this was not necessary