Clean up yet AGAIN since still missing on Github

Change-Id: I31abd01ca4253ed8d1a3975034aa3553eeb071c8