Hygiene: Remove dead code

As the honey badger would say:
Nasty

Change-Id: I341e33b28f7fef7643746aac7a04dd4e08e215c2
(cherry picked from commit 939652e630cac946fabb678eee3f8c78728f3f84)
Merge "Hygiene: Remove dead code"