Hygiene: Remove unreachable code

re-submit

Change-Id: Ic251b7529769b7cedaa8cda78f51099f2980fe97
Merge "Hygiene: Remove unreachable code"