make sure key value map correct + remove device name