Fix d2w and remove related debug msgs