more KeyPart cleanup