Update to latest chef
Simplify