Remove old devices

Change-Id: Idc32529aa24ed4a4ddcaef914a756ea75fa42ac8