4.2.2 cleanup

Change-Id: If0843c3f0ba52a255806e53d2d88c9dc10b96a62