I think none of this is necessary for your code, so could you rebase this file out of  the pull request?