Clean up yet AGAIN since still missing on Github

Change-Id: I1bb1aef6d9e57fe35d1570214b90efdce8112c47