4.2.2 cleanup

Change-Id: I1b74518ff7d93e469f15b7971bb673313dbbf22c