Remove now unnecessary EIP/bpt workaround
Remove now unnecessary rebasing fixups