First part of removing client functionality from the cookbook.  This is without a doubt broken