Revert "KDF work begun"

This reverts commit 64f0ab1ed82881c7ab52d76bffacb4c8b314e665.