Remove old S4 Devices

Change-Id: I090688738b598a006bfc5126748f40673bd86dee