Hygiene: remove old b/c code that was there since October

Change-Id: Ib48d97057fc852010c04dc37ac4d542561a56037
Merge "Hygiene: remove old b/c code that was there since October"