Cleanup

Change-Id: I851338fe0c869ca9b66842653b8a629e106fda92