[COOK-4288] Cleanup the Kitchen

https://tickets.opscode.com/browse/COOK-4288