Cleanup 3

Change-Id: Idd39d3493ab821dd870bf39fe5adb65511d9d2f7