Remove WDN references and other layout cleanup

Merge request reports

Loading