minor cleanup of device manifests