Remove until implementing newKeyPart