Removed unnecessary hunks

Upstream has already included the deleted hunks.