Patch cleanup

Change-Id: Ib9d38ea0ab5171de35aeac7fbaa9f269ca8d745f