Remove waldi leftover

Change-Id: I709f58222bb0b3f4115f7e790fe60f7bced10f48