Only waldi needed

Change-Id: I2e02cdeb6ff312f81d5f19969eb5b4e274abdc74