Update XML copyright headers, more cleanup