Removed unnecessary hunks.

I will squash these commits when the pull request is ready to be closed.