Patches cleanup

Patches cleanup because they are maintained in OwlPatches submodule