[COOK-4286] Cleanup the Kitchen

https://tickets.opscode.com/browse/COOK-4286

/cc @sersut