4.2.2 cleanup

Change-Id: Iad01d24e95419cd49cee7fa2afcc220f4c1e2bd3