Removing WDI stuff