More DW sync cleanup