Remove some leftover code (4.2.2 merge)

Change-Id: I9890f0fdff6b23835a8804d0ce41f609a352d249