Housecleaning

Change-Id: Iefe14c852ba78c74be4519b73d61fc36c73253e7