Cookbook deprecation code enhancements

:construction_worker: