Cleanup to enable role-less cookbook