KDF key handling cleanup