PROV-697 Remove keys that cause warnings