Code clean-up

--
PiperOrigin-RevId: 148992499
MOS_MIGRATED_REVID=148992499