More DW data sync cleanup