Clean up

Change-Id: Ie28d6394ab03d52a32b5a63df564fe228d3dbebb