First thing I'd do is redraw the entire schematic in DIYLC, or whatever you're using to lay out your PCB.
Do you have/use DIYLC (DoItYourselfLayoutCreator)?
If not, it's a free/donate-something software program that's great for drawing schematics and layouts.
I find DIYLC easier to knock up a schematic quickly than in Eagle, but probably only because I'm still struggling to learn Eagle (and may switch to KiCad soon).
A redraw will clean up the schematic, make it easier to look at and —importantly— let you subtract/add bits of the schematic as needed.
As for the actual ripping out of the buffered bypass, I'm not knowledgeable enough to work that out.
I'll haZard a guess that the entire block at the end can be omitted.

View attachment 93974