touchup and fixes and remove duplicates that already defined in device specific