cleanup3

Change-Id: If77026ec8d8b828e3aa4e560363ce36d8c257f71