Some post-spring cleaning.

Change-Id: Iba935ad3f44e806ee081d13f0d52213ba56148ca