consolidating cookbooks + cleanup