Yeah... turns out it was unnecessary. The diff has gone down by about 200 lines