Just a tip: when I end up in situations like this (and especially with such a huge single commit), I often create a fresh branch based on master (`checkout -b`), bring in the code changes (`checkout feature-my-patch -- .`, `reset HEAD .`), and then go through the code alternating between `git checkout -p` and `git add -p`.

This procedure allows me to easily remove unrelated changes like the above.