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: I5348876712418a520659aab606065e5a5b288d99