cleanups in i9100 support

Change-Id: I4d4581d94e1995a3b1054ce2d3eea9fb439beff1