Cleanup

Change-Id: I5f0186e1a7a3deb077aff92cbb1a2ea656a881de