removed testing device id code in MappingController