Simplify kds to avoid fetching user keys