i9100g: Cleanup

Change-Id: Ic762e57303eef8bb60c1daaa8c668f394b976017