4.2.2 clean up

Change-Id: Ib82ea7192761229e3cf9ed5d4fa83631b561ff0b