More cleanup work.

Change-Id: I0a00aad10002f5c3f2de1994de8147808fbb9574