Cleaning up for Chef v11