Cleanup

Change-Id: I118052301b2bef4f724c7df62e5e2c4ac2b912fe