Placeholder kdf. More cleanup and tests.