Remove old b/c code not needed since late summer

Change-Id: Ic23dc6797add0726933016de6cf911c56e9f676e
Merge "Remove old b/c code not needed since late summer"