Cleanup

Change-Id: I9a9f6ffa60be34685b7230512b1ab89bba043460