4.2.2 cleanup

Change-Id: I9ec32354f6fc123b2e78d76b38a5a71181a4bc74