Removed local patches

These patches make assumptions that are a bit too liberal.
As these cookbooks are more widely used, these should be
moved into a wrapper cookbook.

Change-Id: I015ea209822ba81f0639b24f5df6957c89a6e7b2