Hygiene: Remove stray WAP messages

Change-Id: I2cec2d48c07197db1f48ef9752512a8174a46801