Mostly a clean up of unrequired patches.
This will create a new commit in order to revert the existing changes.
