Removed DW specific references