Removing client resolvers for something simpler