Just moving my comment here, instead of commenting on the individual commit: I think these changes should be done in a separate commit from the one that says "changed copyright headers" and there should be a 'why' in the commit message. It's not clear why these calls are being removed otherwise.