Melanie/Ajay | #4053 | Removed mangrove dependency on DW code