chore: remove duplicated code from the update-and-merge of the core Agave repo

[jason-nitro]

As part of the merge, there were a number of merge artifacts inserted by the automated processes, most of which result in compilation problems. Some are just duplications that are wasteful, and some are comments.

[petarvujovic98]

Wonder why I didn't actually get warned by these, there were at least twice as many which I removed, but these were somehow skipped??

P.S. Let's squash this together with my commit so that we always keep our changes in a single commit to reduce rebaseing steps and complications

[jason-nitro]

Wonder why I didn't actually get warned by these, there were at least twice as many which I removed, but these were somehow skipped??

P.S. Let's squash this together with my commit so that we always keep our changes in a single commit to reduce rebaseing steps and complications

@petarvujovic98 Just to be clear, you did approve the PR, but also I should probably kill the PR and do the rebase or whatever.

[petarvujovic98]

You can still merge the PR with the squash strategy, but then on the zk branch also squash the newly created commit into it's parent (my commit)