Hygiene: Remove dead messages

Change-Id: Ifd24b8a8a4405f82801c30a007f857bafb15b7ef
Merge "Hygiene: Remove dead messages"