Applied patches to ServiceOpalFormatter and removed .patch files