4.2.2 cleanup

Change-Id: I2bd363028aafdc78096a9e42dcd85a031311a060