Remove some old cookbook dependencies and cleanup