Cleanup i9305

Change-Id: I8c22a40e8130f2c7b24994d2dff5b5b28db25b0f